[Extensions] Update ExtensionService references in c/b/extensions
Update references to ExtensionService in c/b/extensions to use
extensions::ExtensionService.
Clean up a few other instances when the extensions:: prefix is
unnecessary.
There should be no behavior change as a result of this CL.
Bug: 117261
Change-Id: I95616145a995bdf5828036b682647d6e61649c8c
Reviewed-on: https://chromium-review.googlesource.com/1076974
Reviewed-by: Istiaque Ahmed <[email protected]>
Commit-Queue: Devlin <[email protected]>
Cr-Commit-Position: refs/heads/master@{#562678}diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc
index 2e470f69..836fac0 100644
--- a/chrome/browser/extensions/api/management/management_apitest.cc
+++ b/chrome/browser/extensions/api/management/management_apitest.cc
@@ -157,8 +157,9 @@
LoadExtensions();
extensions::ScopedTestDialogAutoConfirm auto_confirm(
extensions::ScopedTestDialogAutoConfirm::ACCEPT);
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
false));
@@ -183,8 +184,9 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest,
MAYBE_ManagementPolicyProhibited) {
LoadExtensions();
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
EXPECT_TRUE(service->GetExtensionById(extension_ids_["enabled_extension"],
false));
@@ -200,8 +202,9 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
// Load an extension that calls launchApp() on any app that gets
// installed.
@@ -257,8 +260,9 @@
#define MAYBE_LaunchTabApp LaunchTabApp
#endif
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_LaunchTabApp) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
// Load an extension that calls launchApp() on any app that gets
// installed.
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
index adba1640..6dbc40a 100644
--- a/chrome/browser/extensions/api/management/management_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -206,8 +206,9 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, MAYBE_InstallRequiresConfirm) {
// Installing the extension without an auto confirming UI should result in
// it being disabled, since good.crx has permissions that require approval.
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
std::string id = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
ASSERT_FALSE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 0));
ASSERT_TRUE(service->GetExtensionById(id, true));
@@ -357,8 +358,9 @@
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
const size_t size_before = registry->enabled_extensions().size();
ASSERT_TRUE(registry->disabled_extensions().is_empty());
@@ -460,8 +462,9 @@
// Install version 1 of the extension.
ExtensionTestMessageListener listener1("v1 installed", false);
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
const size_t enabled_size_before = registry->enabled_extensions().size();
const size_t disabled_size_before = registry->disabled_extensions().size();
@@ -505,8 +508,9 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalUrlUpdate) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -540,9 +544,10 @@
service->pending_extension_manager();
// The code that reads external_extensions.json uses this method to inform
- // the ExtensionService of an extension to download. Using the real code
- // is race-prone, because instantating the ExtensionService starts a read
- // of external_extensions.json before this test function starts.
+ // the extensions::ExtensionService of an extension to download. Using the
+ // real code is race-prone, because instantating the
+ // extensions::ExtensionService starts a read of external_extensions.json
+ // before this test function starts.
EXPECT_TRUE(pending_extension_manager->AddFromExternalUpdateUrl(
kExtensionId,
@@ -610,8 +615,9 @@
// See http://crbug.com/57378 for flakiness details.
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, ExternalPolicyRefresh) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -698,8 +704,9 @@
IN_PROC_BROWSER_TEST_F(ExtensionManagementTest,
MAYBE_PolicyOverridesUserInstall) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
ExtensionRegistry* registry = ExtensionRegistry::Get(browser()->profile());
const char kExtensionId[] = "ogjcoiohnmldgjemafoockdghcjciccf";
const size_t size_before = registry->enabled_extensions().size();
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
index b30736ca..f5cbef0e 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -190,7 +190,7 @@
reload_info.second);
reload_info.first = now;
- ExtensionService* service =
+ extensions::ExtensionService* service =
ExtensionSystem::Get(browser_context_)->extension_service();
if (reload_info.second >= kFastReloadCount) {
// Unloading an extension clears all warnings, so first terminate the
@@ -199,8 +199,9 @@
// asynchronously. Fortunately PostTask guarentees FIFO order so just
// post both tasks.
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::BindOnce(&ExtensionService::TerminateExtension,
- service->AsWeakPtr(), extension_id));
+ FROM_HERE,
+ base::BindOnce(&extensions::ExtensionService::TerminateExtension,
+ service->AsWeakPtr(), extension_id));
extensions::WarningSet warnings;
warnings.insert(
extensions::Warning::CreateReloadTooFrequentWarning(
@@ -214,8 +215,9 @@
// it tries to decrease the reference count for the extension, which fails
// if the extension has already been reloaded; so instead we post a task.
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::BindOnce(&ExtensionService::ReloadExtension,
- service->AsWeakPtr(), extension_id));
+ FROM_HERE,
+ base::BindOnce(&extensions::ExtensionService::ReloadExtension,
+ service->AsWeakPtr(), extension_id));
}
}
@@ -223,7 +225,7 @@
const std::string& extension_id,
const UpdateCheckCallback& callback) {
ExtensionSystem* system = ExtensionSystem::Get(browser_context_);
- ExtensionService* service = system->extension_service();
+ extensions::ExtensionService* service = system->extension_service();
ExtensionUpdater* updater = service->updater();
if (!updater) {
return false;
@@ -360,7 +362,7 @@
void ChromeRuntimeAPIDelegate::UpdateCheckComplete(
const std::string& extension_id) {
ExtensionSystem* system = ExtensionSystem::Get(browser_context_);
- ExtensionService* service = system->extension_service();
+ extensions::ExtensionService* service = system->extension_service();
const Extension* update = service->GetPendingExtensionUpdate(extension_id);
UpdateCheckInfo& info = update_check_info_[extension_id];
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc
index 1c8beeb..5685c04c 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc
@@ -77,7 +77,7 @@
SyncFileSystemServiceFactory::GetInstance();
content::BrowserContext* context = browser()->profile();
- ExtensionServiceInterface* extension_service =
+ extensions::ExtensionServiceInterface* extension_service =
extensions::ExtensionSystem::Get(context)->extension_service();
std::unique_ptr<drive_backend::SyncEngine::DriveServiceFactory>
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
index 000c2d5..2dee80d 100644
--- a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
+++ b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
@@ -445,7 +445,7 @@
->GetTestInterface()
->GetService(service_path, &profile_path, &properties));
- ExtensionService* extension_service =
+ extensions::ExtensionService* extension_service =
extensions::ExtensionSystem::Get(profile())->extension_service();
extension_service->DisableExtension(
extension_id_, extensions::disable_reason::DISABLE_USER_ACTION);
@@ -471,7 +471,7 @@
->GetTestInterface()
->GetService(service_path, &profile_path, &properties));
- ExtensionService* extension_service =
+ extensions::ExtensionService* extension_service =
extensions::ExtensionSystem::Get(profile())->extension_service();
extension_service->BlacklistExtensionForTest(extension_id_);
content::RunAllPendingInMessageLoop();
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 790b275c..0e08d7dd 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -313,8 +313,9 @@
#define MAYBE_BookmarkAppGetsNormalProcess BookmarkAppGetsNormalProcess
#endif
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
extensions::ProcessMap* process_map =
extensions::ProcessMap::Get(browser()->profile());
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index 7d1edb9..12a803e 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -92,9 +92,9 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#endif
-namespace {
+namespace extensions {
-using extensions::BookmarkAppHelper;
+namespace {
// Overlays a shortcut icon over the bottom left corner of a given image.
class GeneratedIconImageSource : public gfx::CanvasImageSource {
@@ -189,8 +189,8 @@
generated_icon_color = SK_ColorDKGRAY;
for (int size : generate_sizes) {
- extensions::BookmarkAppHelper::GenerateIcon(
- bitmap_map, size, generated_icon_color, icon_letter);
+ BookmarkAppHelper::GenerateIcon(bitmap_map, size, generated_icon_color,
+ icon_letter);
}
}
@@ -218,8 +218,7 @@
public:
BookmarkAppInstaller(ExtensionService* service,
const WebApplicationInfo& web_app_info)
- : service_(service),
- web_app_info_(web_app_info) {}
+ : service_(service), web_app_info_(web_app_info) {}
void Run() {
for (const auto& icon : web_app_info_.icons) {
@@ -317,8 +316,7 @@
downloaded_bitmaps_, sizes_to_generate, &web_app_info_);
BookmarkAppHelper::UpdateWebAppIconsWithoutChangingLinks(size_map,
&web_app_info_);
- scoped_refptr<extensions::CrxInstaller> installer(
- extensions::CrxInstaller::CreateSilent(service_));
+ scoped_refptr<CrxInstaller> installer(CrxInstaller::CreateSilent(service_));
installer->set_error_on_unsupported_requirements(true);
installer->InstallWebApp(web_app_info_);
}
@@ -334,8 +332,6 @@
} // namespace
-namespace extensions {
-
// static
void BookmarkAppHelper::UpdateWebAppInfoFromManifest(
const blink::Manifest& manifest,
@@ -538,7 +534,7 @@
: profile_(profile),
contents_(contents),
web_app_info_(web_app_info),
- crx_installer_(extensions::CrxInstaller::CreateSilent(
+ crx_installer_(CrxInstaller::CreateSilent(
ExtensionSystem::Get(profile)->extension_service())),
install_source_(install_source),
weak_factory_(this) {
@@ -550,8 +546,7 @@
if (!base::FeatureList::IsEnabled(features::kDesktopPWAWindowing)) {
web_app_info_.open_as_window =
profile_->GetPrefs()->GetInteger(
- extensions::pref_names::kBookmarkAppCreationLaunchType) ==
- extensions::LAUNCH_TYPE_WINDOW;
+ pref_names::kBookmarkAppCreationLaunchType) == LAUNCH_TYPE_WINDOW;
}
// The default app title is the page title, which can be quite long. Limit the
@@ -562,12 +557,10 @@
base::UTF8ToUTF16("...");
}
- registrar_.Add(this,
- extensions::NOTIFICATION_CRX_INSTALLER_DONE,
+ registrar_.Add(this, NOTIFICATION_CRX_INSTALLER_DONE,
content::Source<CrxInstaller>(crx_installer_.get()));
- registrar_.Add(this,
- extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR,
+ registrar_.Add(this, NOTIFICATION_EXTENSION_INSTALL_ERROR,
content::Source<CrxInstaller>(crx_installer_.get()));
crx_installer_->set_error_on_unsupported_requirements(true);
@@ -579,8 +572,7 @@
callback_ = callback;
// Do not fetch the manifest for extension URLs.
- if (contents_ &&
- !contents_->GetVisibleURL().SchemeIs(extensions::kExtensionScheme)) {
+ if (contents_ && !contents_->GetVisibleURL().SchemeIs(kExtensionScheme)) {
// Null in tests. OnDidPerformInstallableCheck is called via a testing API.
// TODO(crbug.com/829232) ensure this is consistent with other calls to
// GetData.
@@ -745,21 +737,20 @@
void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
// Set the default 'open as' preference for use next time the dialog is
// shown.
- extensions::LaunchType launch_type = web_app_info_.open_as_window
- ? extensions::LAUNCH_TYPE_WINDOW
- : extensions::LAUNCH_TYPE_REGULAR;
+ LaunchType launch_type =
+ web_app_info_.open_as_window ? LAUNCH_TYPE_WINDOW : LAUNCH_TYPE_REGULAR;
if (base::FeatureList::IsEnabled(features::kDesktopPWAWindowing)) {
DCHECK_NE(ForInstallableSite::kUnknown, for_installable_site_);
launch_type = for_installable_site_ == ForInstallableSite::kYes
- ? extensions::LAUNCH_TYPE_WINDOW
- : extensions::LAUNCH_TYPE_REGULAR;
+ ? LAUNCH_TYPE_WINDOW
+ : LAUNCH_TYPE_REGULAR;
}
- profile_->GetPrefs()->SetInteger(
- extensions::pref_names::kBookmarkAppCreationLaunchType, launch_type);
+ profile_->GetPrefs()->SetInteger(pref_names::kBookmarkAppCreationLaunchType,
+ launch_type);
// Set the launcher type for the app.
- extensions::SetLaunchType(profile_, extension->id(), launch_type);
+ SetLaunchType(profile_, extension->id(), launch_type);
if (!contents_) {
// The web contents can be null in tests.
@@ -814,8 +805,7 @@
// Reparent the tab into an app window immediately when opening as a window.
if (base::FeatureList::IsEnabled(features::kDesktopPWAWindowing) &&
- launch_type == extensions::LAUNCH_TYPE_WINDOW &&
- !profile_->IsOffTheRecord()) {
+ launch_type == LAUNCH_TYPE_WINDOW && !profile_->IsOffTheRecord()) {
ReparentWebContentsIntoAppBrowser(contents_, extension);
}
#endif // !defined(OS_MACOSX)
@@ -837,7 +827,7 @@
// created (e.g. due to management policies). Add to shelf visibility should
// be gated on whether extensions can be created - see crbug.com/545541.
switch (type) {
- case extensions::NOTIFICATION_CRX_INSTALLER_DONE: {
+ case NOTIFICATION_CRX_INSTALLER_DONE: {
const Extension* extension =
content::Details<const Extension>(details).ptr();
if (extension) {
@@ -849,7 +839,7 @@
}
break;
}
- case extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR:
+ case NOTIFICATION_EXTENSION_INSTALL_ERROR:
callback_.Run(nullptr, web_app_info_);
break;
default:
diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc
index fc02b55..db24543b 100644
--- a/chrome/browser/extensions/chrome_app_api_browsertest.cc
+++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -199,8 +199,9 @@
EXPECT_TRUE(IsAppInstalledInMainFrame());
// Disable the extension and verify the state.
- ExtensionService* service = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service();
+ extensions::ExtensionService* service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
service->DisableExtension(
extension->id(),
extensions::disable_reason::DISABLE_PERMISSIONS_INCREASE);
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 9f286ce..6e2d32d 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -47,7 +47,7 @@
std::make_unique<NotificationDisplayServiceTester>(profile());
}
- ExtensionService* GetExtensionService() {
+ extensions::ExtensionService* GetExtensionService() {
return extensions::ExtensionSystem::Get(browser()->profile())->
extension_service();
}
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
index 4b6422b..e8350b4 100644
--- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -119,7 +119,7 @@
return extension;
}
- ExtensionService* service_;
+ extensions::ExtensionService* service_;
ExtensionRegistry* registry_;
base::ScopedTempDir scoped_temp_dir_;
base::FilePath path_v1_;
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 347c7a25..5932e48 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -144,7 +144,7 @@
ASSERT_EQ(num_expected_extensions,
GetNonComponentEnabledExtensionCount(browser()->profile()));
- ExtensionService* service =
+ extensions::ExtensionService* service =
extensions::ExtensionSystem::Get(browser()->profile())
->extension_service();
ASSERT_EQ(expect_extensions_enabled, service->extensions_enabled());
diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc
index 57c43bb..c5f150e 100644
--- a/chrome/browser/extensions/extension_sync_service.cc
+++ b/chrome/browser/extensions/extension_sync_service.cc
@@ -569,7 +569,7 @@
theme.id(), CreateSyncData(theme).GetSyncData());
}
-ExtensionService* ExtensionSyncService::extension_service() const {
+extensions::ExtensionService* ExtensionSyncService::extension_service() const {
return ExtensionSystem::Get(profile_)->extension_service();
}
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
index 7e641eb..e6bd988 100644
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
@@ -30,11 +30,12 @@
using content::BrowserContext;
using content::BrowserThread;
+namespace extensions {
+
namespace {
-extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
- extensions::ExtensionSystem* extension_system =
- extensions::ExtensionSystem::Get(context);
+ComponentLoader* GetComponentLoader(BrowserContext* context) {
+ ExtensionSystem* extension_system = ExtensionSystem::Get(context);
ExtensionService* extension_service = extension_system->extension_service();
return extension_service->component_loader();
}
@@ -42,7 +43,7 @@
void LoadGaiaAuthExtension(BrowserContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- extensions::ComponentLoader* component_loader = GetComponentLoader(context);
+ ComponentLoader* component_loader = GetComponentLoader(context);
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
@@ -58,13 +59,11 @@
void UnloadGaiaAuthExtension(BrowserContext* context) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- GetComponentLoader(context)->Remove(extensions::kGaiaAuthExtensionId);
+ GetComponentLoader(context)->Remove(kGaiaAuthExtensionId);
}
} // namespace
-namespace extensions {
-
GaiaAuthExtensionLoader::GaiaAuthExtensionLoader(BrowserContext* context)
: browser_context_(context),
load_count_(0),
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 4938865..c620662 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -25,13 +25,14 @@
#include "ui/base/l10n/l10n_util.h"
// static
-void ThemeInstalledInfoBarDelegate::Create(InfoBarService* infobar_service,
- ExtensionService* extension_service,
- ThemeService* theme_service,
- const std::string& theme_name,
- const std::string& theme_id,
- const std::string& previous_theme_id,
- bool previous_using_system_theme) {
+void ThemeInstalledInfoBarDelegate::Create(
+ InfoBarService* infobar_service,
+ extensions::ExtensionService* extension_service,
+ ThemeService* theme_service,
+ const std::string& theme_name,
+ const std::string& theme_id,
+ const std::string& previous_theme_id,
+ bool previous_using_system_theme) {
// Create the new infobar.
std::unique_ptr<infobars::InfoBar> new_infobar(
infobar_service->CreateConfirmInfoBar(
@@ -64,7 +65,7 @@
}
ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
- ExtensionService* extension_service,
+ extensions::ExtensionService* extension_service,
ThemeService* theme_service,
const std::string& theme_name,
const std::string& theme_id,
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index a1e8c35..55d75e5 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -260,7 +260,7 @@
// If the user has overridden the update frequency, don't bother reporting
// this.
- if (frequency_seconds_ == extensions::kDefaultUpdateFrequencySeconds) {
+ if (frequency_seconds_ == kDefaultUpdateFrequencySeconds) {
Time last = Time::FromInternalValue(prefs_->GetInt64(
pref_names::kLastUpdateCheck));
if (last.ToInternalValue() != 0) {
@@ -600,8 +600,7 @@
// Source parameter ensures that we only see the completion event for the
// the installer we started.
- registrar_.Add(this,
- extensions::NOTIFICATION_CRX_INSTALLER_DONE,
+ registrar_.Add(this, NOTIFICATION_CRX_INSTALLER_DONE,
content::Source<CrxInstaller>(installer));
} else {
for (const int request_id : crx_file.request_ids) {
@@ -621,9 +620,9 @@
void ExtensionUpdater::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
- DCHECK_EQ(extensions::NOTIFICATION_CRX_INSTALLER_DONE, type);
+ DCHECK_EQ(NOTIFICATION_CRX_INSTALLER_DONE, type);
- registrar_.Remove(this, extensions::NOTIFICATION_CRX_INSTALLER_DONE, source);
+ registrar_.Remove(this, NOTIFICATION_CRX_INSTALLER_DONE, source);
crx_install_is_running_ = false;
// If installing this file didn't succeed, we may need to re-download it.
@@ -635,8 +634,7 @@
: ExtensionUpdaterUpdateResult::UPDATE_INSTALL_ERROR,
ExtensionUpdaterUpdateResult::UPDATE_RESULT_COUNT);
- extensions::CrxInstaller* installer =
- content::Source<extensions::CrxInstaller>(source).ptr();
+ CrxInstaller* installer = content::Source<CrxInstaller>(source).ptr();
const FetchedCRXFile& crx_file = current_crx_file_;
if (!extension && installer->hash_check_failed() &&
!crx_file.callback.is_null()) {
@@ -663,7 +661,7 @@
void ExtensionUpdater::NotifyStarted() {
content::NotificationService::current()->Notify(
- extensions::NOTIFICATION_EXTENSION_UPDATING_STARTED,
+ NOTIFICATION_EXTENSION_UPDATING_STARTED,
content::Source<Profile>(profile_),
content::NotificationService::NoDetails());
}
diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
index 2c902f6..2682fff 100644
--- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
@@ -158,9 +158,9 @@
.Build();
ASSERT_TRUE(hosted_app.get());
- ExtensionService* extension_service =
- extensions::ExtensionSystem::Get(browser()->profile())->
- extension_service();
+ extensions::ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(browser()->profile())
+ ->extension_service();
extensions::ExtensionRegistry* registry =
extensions::ExtensionRegistry::Get(browser()->profile());
