Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4327)

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 349073004: Cleanup: Remove deprecated Profile::GetExtensionService(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/off_the_record_profile_impl.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 63dfe718ae51afa900bfd18f92ea34852e4a9f7a..7612d381701a55ba481acd71d89d57ce70c3c872 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_service.h"
#include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/io_thread.h"
#include "chrome/browser/net/pref_proxy_config_tracker.h"
@@ -44,8 +43,6 @@
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/url_data_source.h"
#include "content/public/browser/web_contents.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/common/extension.h"
#include "net/http/http_server_properties.h"
#include "net/http/transport_security_state.h"
#include "webkit/browser/database/database_tracker.h"
@@ -70,11 +67,10 @@
#endif
#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/guest_view/guest_view_manager.h"
-#endif
-
-#if defined(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
+#include "chrome/browser/guest_view/guest_view_manager.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/common/extension.h"
#endif
using content::BrowserThread;
@@ -259,10 +255,6 @@ Profile* OffTheRecordProfileImpl::GetOriginalProfile() {
return profile_;
}
-ExtensionService* OffTheRecordProfileImpl::GetExtensionService() {
- return extensions::ExtensionSystem::Get(this)->extension_service();
-}
-
ExtensionSpecialStoragePolicy*
OffTheRecordProfileImpl::GetExtensionSpecialStoragePolicy() {
return GetOriginalProfile()->GetExtensionSpecialStoragePolicy();
@@ -358,7 +350,8 @@ HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
if (!host_content_settings_map_.get()) {
host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), true);
#if defined(ENABLE_EXTENSIONS)
- ExtensionService* extension_service = GetExtensionService();
+ ExtensionService* extension_service =
+ extensions::ExtensionSystem::Get(this)->extension_service();
if (extension_service)
host_content_settings_map_->RegisterExtensionService(extension_service);
#endif

Powered by Google App Engine
This is Rietveld 408576698