diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc | |
parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc')
-rw-r--r-- | chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index 7ad5b39767f..8fd11ee84dd 100644 --- a/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -29,7 +28,6 @@ #include "content/public/browser/notification_types.h" #include "content/public/common/page_zoom.h" #include "extensions/browser/extension_registry.h" -#include "extensions/browser/extension_system.h" #include "extensions/browser/notification_types.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" @@ -341,9 +339,10 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, return; OpenPopupViaAPI(false); - ExtensionService* service = extensions::ExtensionSystem::Get( - browser()->profile())->extension_service(); - ASSERT_FALSE(service->GetExtensionById(last_loaded_extension_id(), false) + ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile()); + ASSERT_FALSE(registry + ->GetExtensionById(last_loaded_extension_id(), + ExtensionRegistry::ENABLED) ->permissions_data() ->HasAPIPermissionForTab( SessionTabHelper::IdForTab( |