Index: chrome/browser/extensions/extension_browsertest.cc |
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc |
index bb263946fce2340abe729ab319f123dd0a0c7e30..56906aef25fdf184ddfd93ca06f368adaf865319 100644 |
--- a/chrome/browser/extensions/extension_browsertest.cc |
+++ b/chrome/browser/extensions/extension_browsertest.cc |
@@ -14,7 +14,6 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
-#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/extensions/browsertest_util.h" |
#include "chrome/browser/extensions/component_loader.h" |
#include "chrome/browser/extensions/crx_installer.h" |
@@ -43,6 +42,7 @@ |
#include "extensions/browser/extension_host.h" |
#include "extensions/browser/extension_prefs.h" |
#include "extensions/browser/extension_system.h" |
+#include "extensions/browser/notification_types.h" |
#include "extensions/browser/uninstall_reason.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension_set.h" |
@@ -151,7 +151,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam( |
ExtensionService* service = extensions::ExtensionSystem::Get( |
profile())->extension_service(); |
{ |
- observer_->Watch(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ observer_->Watch(extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::NotificationService::AllSources()); |
scoped_refptr<extensions::UnpackedInstaller> installer( |
@@ -197,7 +197,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam( |
// Re-enable the extension if needed. |
if (service->extensions()->Contains(extension_id)) { |
content::WindowedNotificationObserver load_signal( |
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::Source<Profile>(profile())); |
// Reload the extension so that the |
// NOTIFICATION_EXTENSION_LOADED_DEPRECATED |
@@ -215,7 +215,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam( |
// cases. |
{ |
content::WindowedNotificationObserver load_signal( |
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::Source<Profile>(profile())); |
CHECK(!extensions::util::IsIncognitoEnabled(extension_id, profile())); |
@@ -229,7 +229,7 @@ ExtensionBrowserTest::LoadExtensionWithInstallParam( |
{ |
content::WindowedNotificationObserver load_signal( |
- chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::Source<Profile>(profile())); |
CHECK(extensions::util::AllowFileAccess(extension_id, profile())); |
if (!(flags & kFlagEnableFileAccess)) { |
@@ -495,7 +495,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( |
} |
observer_->Watch( |
- chrome::NOTIFICATION_CRX_INSTALLER_DONE, |
+ extensions::NOTIFICATION_CRX_INSTALLER_DONE, |
content::Source<extensions::CrxInstaller>(installer.get())); |
installer->InstallCrx(crx_path); |
@@ -531,7 +531,7 @@ const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( |
} |
void ExtensionBrowserTest::ReloadExtension(const std::string extension_id) { |
- observer_->Watch(chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
+ observer_->Watch(extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
content::NotificationService::AllSources()); |
ExtensionService* service = |