struct UnloadedExtensionInfo -> enum UnloadedExtensionInfoReason
We don't need to keep struct UnloadedExtensionInfo.
So removing it and use enum UnloadedExtensionInfoReason instead.
TEST=Everything runs smoothly
BUG=715144
Review-Url: https://codereview.chromium.org/2839373003
Cr-Commit-Position: refs/heads/master@{#469065}
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc
index b24436d8..1732c60 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.cc
+++ b/chrome/browser/extensions/active_tab_permission_granter.cc
@@ -176,7 +176,7 @@
void ActiveTabPermissionGranter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Note: don't need to clear the permissions (nor tell the renderer about it)
// because it's being unloaded anyway.
granted_extensions_.Remove(extension->id());
diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h
index 78e1523..a1245a2 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.h
+++ b/chrome/browser/extensions/active_tab_permission_granter.h
@@ -53,7 +53,7 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Clears any tab-specific permissions for all extensions on |tab_id_| and
// notifies renderers.
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 1b9504d5..908d366a 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -295,7 +295,7 @@
ExtensionRegistry* registry =
ExtensionRegistry::Get(web_contents()->GetBrowserContext());
registry->TriggerOnUnloaded(extension.get(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
// Note: can't EXPECT_FALSE(IsAllowed) here because uninstalled extensions
// are just that... considered to be uninstalled, and the manager might
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 2ab0436..8db97c5 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -681,7 +681,7 @@
void ActivityLog::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!ActivityLogAPI::IsExtensionWhitelisted(extension->id()))
return;
--active_consumers_;
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h
index 789617b..a4781d3 100644
--- a/chrome/browser/extensions/activity_log/activity_log.h
+++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -98,7 +98,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index ee60f40..51a186c 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -290,7 +290,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Profile* profile_;
scoped_refptr<DevToolsAgentHost> agent_host_;
@@ -422,7 +422,7 @@
void ExtensionDevToolsClientHost::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (extension->id() == extension_id_)
Close();
}
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 57b3bf7..071e926 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -293,7 +293,7 @@
void DeveloperPrivateEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DCHECK(profile_->IsSameProfile(Profile::FromBrowserContext(browser_context)));
BroadcastItemStateChanged(developer::EVENT_TYPE_UNLOADED, extension->id());
}
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
index c284ad5..7b0d29f8 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -73,7 +73,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update) override;
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 9e95f90f..557969f6 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -1910,7 +1910,7 @@
void ExtensionDownloadsEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::set<const Extension*>::iterator iter =
shelf_disabling_extensions_.find(extension);
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h
index 5cfcf48..448d7703 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.h
+++ b/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -386,10 +386,9 @@
std::unique_ptr<base::Value> json_arg);
// extensions::ExtensionRegistryObserver.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
Profile* profile_;
AllDownloadItemNotifier notifier_;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
index 63cade4..c01110bc 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
@@ -241,7 +241,7 @@
void OperationManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DeleteOperation(extension->id());
}
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
index 5243080..56257fa 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
@@ -99,7 +99,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Operation* GetOperation(const ExtensionId& extension_id);
void DeleteOperation(const ExtensionId& extension_id);
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index 4dcdce5..21ed2f8 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -186,7 +186,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// EventRouter::Observer implementation.
void OnListenerAdded(const EventListenerInfo& details) override;
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index edea935..53b5f0f 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -627,7 +627,7 @@
void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const std::vector<InputComponentInfo>* input_components =
InputComponents::GetInputComponents(extension);
if (!input_components || input_components->empty())
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
index 4180966..6630ea29 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
@@ -156,7 +156,7 @@
void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
InputImeEventRouter* event_router =
GetInputImeEventRouter(Profile::FromBrowserContext(browser_context));
if (event_router) {
diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h
index b67ff4ae..9529d5f 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api.h
+++ b/chrome/browser/extensions/api/log_private/log_private_api.h
@@ -87,7 +87,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// NetLog::ThreadSafeObserver implementation:
void OnAddEntry(const net::NetLogEntry& entry) override;
diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
index 9d19714..44f8d040 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
+++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
@@ -408,7 +408,7 @@
void LogPrivateAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
StopNetInternalsWatch(extension->id(), base::Closure());
}
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 91a4bca..4481257 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -233,7 +233,7 @@
void OmniboxAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!OmniboxInfo::GetKeyword(extension).empty() && url_service_) {
if (url_service_->loaded()) {
url_service_->RemoveExtensionControlledTURL(
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h
index 5fbec3e..2548083 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.h
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -111,7 +111,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
index 4bdc91e..601e93f 100644
--- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
+++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
@@ -119,7 +119,7 @@
void VerifyTrustAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
base::Bind(&IOPart::OnExtensionUnloaded, base::Unretained(io_part_.get()),
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
index 1d88b3e..85a022ff 100644
--- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
+++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
@@ -64,7 +64,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI:
static BrowserContextKeyedAPIFactory<VerifyTrustAPI>* GetFactoryInstance();
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index a40ff4cc..4305f6a 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -197,7 +197,7 @@
void SettingsOverridesAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const SettingsOverrides* settings = SettingsOverrides::Get(extension);
if (settings) {
if (settings->homepage) {
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
index 89fd425..3c80f897 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -45,7 +45,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void RegisterSearchProvider(const Extension* extension) const;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
index c8feb04..ae8a0387 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
@@ -158,7 +158,7 @@
void SignedInDevicesManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
RemoveChangeObserverForExtension(extension->id());
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
index c3e0b9d..4881532 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
@@ -73,7 +73,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// EventRouter::Observer:
void OnListenerAdded(const EventListenerInfo& details) override;
diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc b/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
index 517086ec..964a4bbd 100644
--- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
+++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
@@ -74,7 +74,7 @@
void SpellcheckAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
SpellcheckDictionaryInfo* spellcheck_info =
GetSpellcheckDictionaryInfo(extension);
if (spellcheck_info) {
diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
index 5acb376..71ed27a 100644
--- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
+++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
@@ -30,7 +30,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 4e20405..286b0bab 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -160,7 +160,7 @@
void StreamsPrivateAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
streams_.erase(extension->id());
}
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h
index 3d987d4..4bca449 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_api.h
+++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h
@@ -66,7 +66,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
index 1f44504..eacadc7 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
@@ -137,7 +137,7 @@
void SystemIndicatorManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
RemoveIndicator(extension->id());
}
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
index fe024985..7604511 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
@@ -46,7 +46,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// ExtensionActionAPI::Observer implementation.
void OnExtensionActionUpdated(
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index 6ad2f25..c1fe19aea 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -285,7 +285,7 @@
void TabCaptureRegistry::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Cleanup all the requested media streams for this extension.
for (std::vector<std::unique_ptr<LiveRequest>>::iterator it =
requests_.begin();
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
index f0eb905..4d4abd6 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
@@ -88,7 +88,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// MediaCaptureDevicesDispatcher::Observer implementation.
void OnRequestUpdate(int original_target_render_process_id,
diff --git a/chrome/browser/extensions/chrome_theme_url_browsertest.cc b/chrome/browser/extensions/chrome_theme_url_browsertest.cc
index c737d5c..7402a16 100644
--- a/chrome/browser/extensions/chrome_theme_url_browsertest.cc
+++ b/chrome/browser/extensions/chrome_theme_url_browsertest.cc
@@ -26,7 +26,7 @@
// Unload the extension so we can reload it below with no chance of side
// effects.
extension_service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
listener.Reset();
// Now try loading the extension as a component extension. This time the
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 496a6c5f..b2c7310 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -51,7 +51,7 @@
}
void UnloadExtension(const std::string& extension_id,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
ASSERT_TRUE(registry_->enabled_extensions().Contains(extension_id));
// Remove the extension with the matching id.
registry_->RemoveEnabled(extension_id);
@@ -59,7 +59,7 @@
}
void RemoveComponentExtension(const std::string& extension_id) override {
- UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadExtension(extension_id, UnloadedExtensionReason::DISABLE);
}
bool is_ready() override { return ready_; }
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index 63c6b04..4a83527 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -84,7 +84,7 @@
// ExtensionRegistryObserver
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
unloaded_.insert(extension->id());
if (awaited_unload_id_ == extension->id()) {
awaited_unload_id_.clear();
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc
index 079171d8..29053b0d 100644
--- a/chrome/browser/extensions/error_console/error_console.cc
+++ b/chrome/browser/extensions/error_console/error_console.cc
@@ -229,7 +229,7 @@
void ErrorConsole::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
CheckEnabled();
}
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h
index b50d558..2ab5a805 100644
--- a/chrome/browser/extensions/error_console/error_console.h
+++ b/chrome/browser/extensions/error_console/error_console.h
@@ -144,7 +144,7 @@
// installed or uninstalled, we may need to turn the ErrorConsole on/off.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionLoaded(content::BrowserContext* browser_context,
const Extension* extension) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 71f77e2..e13b286 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -124,7 +124,7 @@
// Unloading the Apps Developer Tools should disable error console.
registry->RemoveEnabled(adt->id());
- registry->TriggerOnUnloaded(adt.get(), UnloadedExtensionInfo::REASON_DISABLE);
+ registry->TriggerOnUnloaded(adt.get(), UnloadedExtensionReason::DISABLE);
EXPECT_FALSE(error_console_->enabled());
EXPECT_FALSE(error_console_->IsEnabledForChromeExtensionsPage());
EXPECT_FALSE(error_console_->IsEnabledForAppsDeveloperTools());
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index 45a52d9..aefbcc0 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -79,7 +79,7 @@
void ExtensionActionManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
page_actions_.erase(extension->id());
browser_actions_.erase(extension->id());
system_indicators_.erase(extension->id());
diff --git a/chrome/browser/extensions/extension_action_manager.h b/chrome/browser/extensions/extension_action_manager.h
index 6693d81..054768c 100644
--- a/chrome/browser/extensions/extension_action_manager.h
+++ b/chrome/browser/extensions/extension_action_manager.h
@@ -60,7 +60,7 @@
// Implement ExtensionRegistryObserver.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Profile* profile_;
diff --git a/chrome/browser/extensions/extension_action_runner.cc b/chrome/browser/extensions/extension_action_runner.cc
index 5261c38..aba92757 100644
--- a/chrome/browser/extensions/extension_action_runner.cc
+++ b/chrome/browser/extensions/extension_action_runner.cc
@@ -419,7 +419,7 @@
void ExtensionActionRunner::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
PendingScriptMap::iterator iter = pending_scripts_.find(extension->id());
if (iter != pending_scripts_.end()) {
pending_scripts_.erase(iter);
diff --git a/chrome/browser/extensions/extension_action_runner.h b/chrome/browser/extensions/extension_action_runner.h
index a7ab6e3e..f29a0d77 100644
--- a/chrome/browser/extensions/extension_action_runner.h
+++ b/chrome/browser/extensions/extension_action_runner.h
@@ -170,7 +170,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// The total number of requests from the renderer on the current page,
// including any that are pending or were immediately granted.
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index b425a443..7de23ab 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -515,7 +515,7 @@
ExtensionService* service = extensions::ExtensionSystem::Get(
profile())->extension_service();
service->UnloadExtension(extension_id,
- extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extensions::UnloadedExtensionReason::DISABLE);
}
void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) {
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index 7e6ef5c2..61970ad 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -106,11 +106,11 @@
void ExtensionGCMAppHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!IsGCMPermissionEnabled(extension))
return;
- if (reason == UnloadedExtensionInfo::REASON_UPDATE &&
+ if (reason == UnloadedExtensionReason::UPDATE &&
GetGCMDriver()->app_handlers().size() >= 1) {
// When the extension is being updated, it will be first unloaded and then
// loaded again by ExtensionService::AddExtension. If the app handler for
@@ -138,7 +138,7 @@
// When the extention is being uninstalled, it will be unloaded first. We
// should not remove the app handler in this case and it will be handled
// in OnExtensionUninstalled.
- if (reason != UnloadedExtensionInfo::REASON_UNINSTALL)
+ if (reason != UnloadedExtensionReason::UNINSTALL)
RemoveAppHandler(extension->id());
}
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h
index 33f03ed..8201a678 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.h
+++ b/chrome/browser/extensions/extension_gcm_app_handler.h
@@ -82,7 +82,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index 1800970..615deb9 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -182,7 +182,7 @@
void ExtensionKeybindingRegistry::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (ExtensionMatchesFilter(extension))
RemoveExtensionKeybinding(extension, std::string());
}
diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h
index fdc85df2..6df47a5 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.h
+++ b/chrome/browser/extensions/extension_keybinding_registry.h
@@ -141,7 +141,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Returns true if the |extension| matches our extension filter.
bool ExtensionMatchesFilter(const extensions::Extension* extension);
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index b2019ed..654b538 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -377,7 +377,7 @@
// And then test it with the extension disabled.
extension_info_map_->RemoveExtension(extension->id(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
{
std::unique_ptr<net::URLRequest> request(
resource_context_.GetRequestContext()->CreateRequest(
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 7f8b30c..ad71689 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -133,7 +133,7 @@
using extensions::PermissionSet;
using extensions::SharedModuleInfo;
using extensions::SharedModuleService;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
namespace {
@@ -821,7 +821,7 @@
// Unload before doing more cleanup to ensure that nothing is hanging on to
// any of these resources.
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::UNINSTALL);
if (registry_->blacklisted_extensions().Contains(extension->id()))
registry_->RemoveBlacklisted(extension->id());
@@ -991,7 +991,7 @@
registry_->AddDisabled(make_scoped_refptr(extension));
if (registry_->enabled_extensions().Contains(extension->id())) {
registry_->RemoveEnabled(extension->id());
- NotifyExtensionUnloaded(extension, UnloadedExtensionInfo::REASON_DISABLE);
+ NotifyExtensionUnloaded(extension, UnloadedExtensionReason::DISABLE);
} else {
registry_->RemoveTerminated(extension->id());
}
@@ -1049,7 +1049,7 @@
registry_->RemoveTerminated(id);
registry_->AddBlocked(extension.get());
- UnloadExtension(id, extensions::UnloadedExtensionInfo::REASON_LOCK_ALL);
+ UnloadExtension(id, extensions::UnloadedExtensionReason::LOCK_ALL);
}
}
@@ -1169,9 +1169,8 @@
registry_->TriggerOnReady(extension.get());
}
-void ExtensionService::NotifyExtensionUnloaded(
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void ExtensionService::NotifyExtensionUnloaded(const Extension* extension,
+ UnloadedExtensionReason reason) {
registry_->TriggerOnUnloaded(extension, reason);
renderer_helper_->OnExtensionUnloaded(*extension);
@@ -1287,7 +1286,7 @@
}
for (const std::string& id : to_unload)
- UnloadExtension(id, UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadExtension(id, UnloadedExtensionReason::DISABLE);
for (const auto& i : to_disable)
DisableExtension(i.first, i.second);
@@ -1402,9 +1401,8 @@
external_install_manager_->UpdateExternalExtensionAlert();
}
-void ExtensionService::UnloadExtension(
- const std::string& extension_id,
- UnloadedExtensionInfo::Reason reason) {
+void ExtensionService::UnloadExtension(const std::string& extension_id,
+ UnloadedExtensionReason reason) {
// Make sure the extension gets deleted after we return from this function.
int include_mask =
ExtensionRegistry::EVERYTHING & ~ExtensionRegistry::TERMINATED;
@@ -1451,7 +1449,7 @@
const std::string& extension_id) {
scoped_refptr<const Extension> extension(
GetExtensionById(extension_id, false));
- UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadExtension(extension_id, UnloadedExtensionReason::UNINSTALL);
if (extension.get()) {
ExtensionRegistry::Get(profile_)->TriggerOnUninstalled(
extension.get(), extensions::UNINSTALL_REASON_COMPONENT_REMOVED);
@@ -1568,7 +1566,7 @@
if (is_extension_loaded && !reloading) {
// To upgrade an extension in place, unload the old one and then load the
// new one. ReloadExtension disables the extension, which is sufficient.
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_UPDATE);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::UPDATE);
}
if (extension_prefs_->IsExtensionBlacklisted(extension->id())) {
@@ -2077,7 +2075,7 @@
// No need to check for duplicates; inserting a duplicate is a no-op.
registry_->AddTerminated(make_scoped_refptr(extension));
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_TERMINATE);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::TERMINATE);
}
void ExtensionService::TerminateExtension(const std::string& extension_id) {
@@ -2471,7 +2469,7 @@
registry_->AddBlacklisted(extension);
extension_prefs_->SetExtensionBlacklistState(
extension->id(), extensions::BLACKLISTED_MALWARE);
- UnloadExtension(*it, UnloadedExtensionInfo::REASON_BLACKLIST);
+ UnloadExtension(*it, UnloadedExtensionReason::BLACKLIST);
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
extension->location(), Manifest::NUM_LOCATIONS);
}
@@ -2565,6 +2563,6 @@
for (ExtensionIdSet::iterator it = ids_to_unload.begin();
it != ids_to_unload.end();
++it) {
- UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
+ UnloadExtension(*it, UnloadedExtensionReason::PROFILE_SHUTDOWN);
}
}
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 815f383..9ebe85b9 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -160,9 +160,8 @@
const extensions::Extension* extension) = 0;
// Unload the specified extension.
- virtual void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) = 0;
+ virtual void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) = 0;
// Remove the specified component extension.
virtual void RemoveComponentExtension(const std::string& extension_id) = 0;
@@ -215,9 +214,8 @@
bool file_ownership_passed,
extensions::CrxInstaller** out_crx_installer) override;
bool IsExtensionEnabled(const std::string& extension_id) const override;
- void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) override;
void RemoveComponentExtension(const std::string& extension_id) override;
void AddExtension(const extensions::Extension* extension) override;
void AddComponentExtension(const extensions::Extension* extension) override;
@@ -527,9 +525,8 @@
scoped_refptr<const extensions::Extension> extension);
// Handles sending notification that |extension| was unloaded.
- void NotifyExtensionUnloaded(
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason);
+ void NotifyExtensionUnloaded(const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason);
// Common helper to finish installing the given extension.
void FinishInstallation(const extensions::Extension* extension);
diff --git a/chrome/browser/extensions/extension_service_test_with_install.cc b/chrome/browser/extensions/extension_service_test_with_install.cc
index e4706a1..2c994aa 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.cc
+++ b/chrome/browser/extensions/extension_service_test_with_install.cc
@@ -41,10 +41,11 @@
ExtensionServiceTestWithInstall::ExtensionServiceTestWithInstall()
: installed_(nullptr),
was_update_(false),
- unloaded_reason_(UnloadedExtensionInfo::REASON_UNDEFINED),
+ unloaded_reason_(UnloadedExtensionReason::UNDEFINED),
expected_extensions_count_(0),
override_external_install_prompt_(
- FeatureSwitch::prompt_for_external_extensions(), false),
+ FeatureSwitch::prompt_for_external_extensions(),
+ false),
registry_observer_(this) {}
ExtensionServiceTestWithInstall::~ExtensionServiceTestWithInstall() {}
@@ -389,7 +390,7 @@
void ExtensionServiceTestWithInstall::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
unloaded_id_ = extension->id();
unloaded_reason_ = reason;
extensions::ExtensionList::iterator i =
diff --git a/chrome/browser/extensions/extension_service_test_with_install.h b/chrome/browser/extensions/extension_service_test_with_install.h
index 92bd6cc..8cec6c3 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.h
+++ b/chrome/browser/extensions/extension_service_test_with_install.h
@@ -124,7 +124,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update,
@@ -136,7 +136,7 @@
bool was_update_;
std::string old_name_;
std::string unloaded_id_;
- UnloadedExtensionInfo::Reason unloaded_reason_;
+ UnloadedExtensionReason unloaded_reason_;
private:
void InstallCRXInternal(const base::FilePath& crx_path,
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 4862477..a870c20 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -182,7 +182,7 @@
using extensions::MockExternalProvider;
using extensions::PermissionSet;
using extensions::TestExtensionSystem;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
using extensions::URLPatternSet;
namespace keys = extensions::manifest_keys;
@@ -4417,7 +4417,7 @@
EXPECT_EQ(1u, registry()->enabled_extensions().size());
UninstallExtension(good_crx, false);
EXPECT_EQ(0u, registry()->enabled_extensions().size());
- EXPECT_EQ(UnloadedExtensionInfo::REASON_UNINSTALL, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::UNINSTALL, unloaded_reason_);
}
TEST_F(ExtensionServiceTest, UninstallTerminatedExtension) {
@@ -4425,7 +4425,7 @@
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
UninstallExtension(good_crx, false);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_TERMINATE, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::TERMINATE, unloaded_reason_);
}
// Tests the uninstaller helper.
@@ -4433,7 +4433,7 @@
InitializeEmptyExtensionService();
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
UninstallExtension(good_crx, true);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_UNINSTALL, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::UNINSTALL, unloaded_reason_);
}
TEST_F(ExtensionServiceTest, UninstallExtensionHelperTerminated) {
@@ -4441,7 +4441,7 @@
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
UninstallExtension(good_crx, true);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_TERMINATE, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::TERMINATE, unloaded_reason_);
}
// An extension disabled because of unsupported requirements should re-enabled
@@ -6866,7 +6866,7 @@
InitializeEmptyExtensionService();
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
- EXPECT_NE(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
+ EXPECT_NE(UnloadedExtensionReason::PROFILE_SHUTDOWN, unloaded_reason_);
EXPECT_EQ(1u, registry()->enabled_extensions().size());
EXPECT_EQ(0u, registry()->disabled_extensions().size());
EXPECT_EQ(0u, registry()->terminated_extensions().size());
@@ -6875,7 +6875,7 @@
service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
content::Source<Profile>(profile()),
content::NotificationService::NoDetails());
- EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::PROFILE_SHUTDOWN, unloaded_reason_);
EXPECT_EQ(0u, registry()->enabled_extensions().size());
EXPECT_EQ(0u, registry()->disabled_extensions().size());
EXPECT_EQ(0u, registry()->terminated_extensions().size());
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index 4d37a95a..530adf8cb 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -303,7 +303,7 @@
void ExtensionStorageMonitor::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
StopMonitoringStorage(extension->id());
}
diff --git a/chrome/browser/extensions/extension_storage_monitor.h b/chrome/browser/extensions/extension_storage_monitor.h
index 31f4a9ef..8c59fd5b 100644
--- a/chrome/browser/extensions/extension_storage_monitor.h
+++ b/chrome/browser/extensions/extension_storage_monitor.h
@@ -64,7 +64,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update,
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index ce9b92141..251b8a2 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -461,7 +461,7 @@
void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) {
+ const UnloadedExtensionReason reason) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::BindOnce(&InfoMap::RemoveExtension, info_map(),
extension_id, reason));
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index fb8d8f1d..68c6b64 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -66,7 +66,7 @@
void UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) override;
+ const UnloadedExtensionReason reason) override;
const OneShotEvent& ready() const override;
ContentVerifier* content_verifier() override; // shared
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.cc b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
index ca8f86f1..eb427c6 100644
--- a/chrome/browser/extensions/extension_web_ui_override_registrar.cc
+++ b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
@@ -41,7 +41,7 @@
void ExtensionWebUIOverrideRegistrar::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
ExtensionWebUI::DeactivateChromeURLOverrides(
Profile::FromBrowserContext(browser_context),
URLOverrides::GetChromeURLOverrides(extension));
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.h b/chrome/browser/extensions/extension_web_ui_override_registrar.h
index 93c7e56c..6436529 100644
--- a/chrome/browser/extensions/extension_web_ui_override_registrar.h
+++ b/chrome/browser/extensions/extension_web_ui_override_registrar.h
@@ -36,7 +36,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
UninstallReason reason) override;
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 2235cca..f4774c5 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -75,7 +75,7 @@
private:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
original_complete_.reset(new LazyBackgroundObserver(profile_));
incognito_complete_.reset(
new LazyBackgroundObserver(profile_->GetOffTheRecordProfile()));
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc
index 7bfaf2d..fee129e 100644
--- a/chrome/browser/extensions/menu_manager.cc
+++ b/chrome/browser/extensions/menu_manager.cc
@@ -855,7 +855,7 @@
void MenuManager::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
MenuItem::ExtensionKey extension_key(extension->id());
if (base::ContainsKey(context_items_, extension_key)) {
RemoveAllContextItems(extension_key);
diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h
index ec9f8a4..06f21209 100644
--- a/chrome/browser/extensions/menu_manager.h
+++ b/chrome/browser/extensions/menu_manager.h
@@ -360,7 +360,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Stores the menu items for the extension in the state storage.
void WriteToStorage(const Extension* extension,
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 871c0b7e..da6b3a45 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -459,8 +459,7 @@
// Notify that the extension was unloaded, and make sure the right item is
// gone.
ExtensionRegistry* registry = ExtensionRegistry::Get(profile_.get());
- registry->TriggerOnUnloaded(extension1,
- UnloadedExtensionInfo::REASON_DISABLE);
+ registry->TriggerOnUnloaded(extension1, UnloadedExtensionReason::DISABLE);
ASSERT_EQ(NULL, manager_.MenuItems(MenuItem::ExtensionKey(extension1->id())));
ASSERT_EQ(
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 688f79f..ca880b4 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -97,7 +97,7 @@
void PluginManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
bool plugins_or_nacl_changed = false;
#if !defined(DISABLE_NACL)
const NaClModuleInfo::List* nacl_modules =
diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h
index b0424ab..4f1257d 100644
--- a/chrome/browser/extensions/plugin_manager.h
+++ b/chrome/browser/extensions/plugin_manager.h
@@ -59,7 +59,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() { return "PluginManager"; }
diff --git a/chrome/browser/extensions/renderer_initialization_browsertest.cc b/chrome/browser/extensions/renderer_initialization_browsertest.cc
index 139e939..4f6eef6 100644
--- a/chrome/browser/extensions/renderer_initialization_browsertest.cc
+++ b/chrome/browser/extensions/renderer_initialization_browsertest.cc
@@ -28,7 +28,7 @@
ui::PAGE_TRANSITION_TYPED, false));
// Without waiting for the tab to finish, unload the extension.
extension_service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_TERMINATE);
+ UnloadedExtensionReason::TERMINATE);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
// Wait for the web contents to stop loading.
diff --git a/chrome/browser/extensions/shared_user_script_master.cc b/chrome/browser/extensions/shared_user_script_master.cc
index 0b084fa..201dfff 100644
--- a/chrome/browser/extensions/shared_user_script_master.cc
+++ b/chrome/browser/extensions/shared_user_script_master.cc
@@ -34,7 +34,7 @@
void SharedUserScriptMaster::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const UserScriptList& script_list =
ContentScriptsInfo::GetContentScripts(extension);
std::set<UserScriptIDPair> scripts_to_remove;
diff --git a/chrome/browser/extensions/shared_user_script_master.h b/chrome/browser/extensions/shared_user_script_master.h
index b3e99cff..d3319972 100644
--- a/chrome/browser/extensions/shared_user_script_master.h
+++ b/chrome/browser/extensions/shared_user_script_master.h
@@ -41,7 +41,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Gets an extension's scripts' metadata; i.e., gets a list of UserScript
// objects that contains script info, but not the contents of the scripts.
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index d04d905..3ba0c93c 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -614,10 +614,9 @@
return web_contents();
}
-void TabHelper::OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void TabHelper::OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const Extension* extension,
+ UnloadedExtensionReason reason) {
DCHECK(extension_app_);
if (extension == extension_app_)
SetExtensionApp(nullptr);
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 5e81fba..09b09f6 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -152,7 +152,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Message handlers.
void OnDidGetWebApplicationInfo(const WebApplicationInfo& info);
diff --git a/chrome/browser/extensions/tab_helper_unittest.cc b/chrome/browser/extensions/tab_helper_unittest.cc
index 175c222..6b48dc8 100644
--- a/chrome/browser/extensions/tab_helper_unittest.cc
+++ b/chrome/browser/extensions/tab_helper_unittest.cc
@@ -24,7 +24,7 @@
EXPECT_EQ(extension, tab_helper->extension_app());
EXPECT_TRUE(tab_helper->is_app());
service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_UNDEFINED);
+ UnloadedExtensionReason::UNDEFINED);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(nullptr, tab_helper->extension_app());
}
diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc
index ae2c2b8..acd59938 100644
--- a/chrome/browser/extensions/test_extension_service.cc
+++ b/chrome/browser/extensions/test_extension_service.cc
@@ -81,7 +81,7 @@
void TestExtensionService::UnloadExtension(
const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
ADD_FAILURE();
}
diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h
index 64d0ab3..6a553d8 100644
--- a/chrome/browser/extensions/test_extension_service.h
+++ b/chrome/browser/extensions/test_extension_service.h
@@ -48,9 +48,8 @@
void AddExtension(const extensions::Extension* extension) override;
void AddComponentExtension(const extensions::Extension* extension) override;
- void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) override;
void RemoveComponentExtension(const std::string& extension_id) override;
};
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index 36ebb6ac..3109b91 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -267,7 +267,7 @@
void UserScriptListener::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (ContentScriptsInfo::GetContentScripts(extension).empty())
return; // No patterns to delete for this extension.
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index 951a16f4..2eeda6f 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -113,7 +113,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnShutdown(ExtensionRegistry* registry) override;
ScopedObserver<extensions::ExtensionRegistry,
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index bdc92d7..80d206f 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -214,7 +214,7 @@
ExtensionRegistry::Get(profile_)->enabled_extensions();
ASSERT_FALSE(extensions.is_empty());
service_->UnloadExtension((*extensions.begin())->id(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
}
content::TestBrowserThreadBundle thread_bundle_;
