chrome/browser/extensions/extension_service.cc - Issue 653623002: Revert "Move ExtensionCache to //extensions"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 653623002: Revert "Move ExtensionCache to //extensions" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Enable AutoEnrollmentClientTest.* and DeviceLocalAccountExternalPolicyLoaderTest.CacheNotStarted te… Created 6 years, 2 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

« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui_browsertest.cc ('k') | chrome/browser/extensions/external_provider_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc

index f33f1f208ebe592711379b5e3dfb2ff71579b11b..899fa2e1e7368b7893ad058acd6501afc49fa610 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

@@ -42,6 +42,7 @@

#include "chrome/browser/extensions/shared_module_service.h"

#include "chrome/browser/extensions/unpacked_installer.h"

#include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h"

+#include "chrome/browser/extensions/updater/extension_cache.h"

#include "chrome/browser/extensions/updater/extension_downloader.h"

#include "chrome/browser/extensions/updater/extension_updater.h"

#include "chrome/browser/google/google_brand.h"

@@ -67,12 +68,10 @@

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

-#include "extensions/browser/extensions_browser_client.h"

#include "extensions/browser/install_flag.h"

#include "extensions/browser/runtime_data.h"

#include "extensions/browser/uninstall_reason.h"

#include "extensions/browser/update_observer.h"

-#include "extensions/browser/updater/extension_cache.h"

#include "extensions/common/extension_messages.h"

#include "extensions/common/extension_urls.h"

#include "extensions/common/feature_switch.h"

@@ -186,8 +185,7 @@ bool ExtensionService::OnExternalExtensionUpdateUrlFound(

if (Manifest::IsExternalLocation(location)) {

// All extensions that are not user specific can be cached.

- extensions::ExtensionsBrowserClient::Get()->GetExtensionCache()

- ->AllowCaching(id);

+ extensions::ExtensionCache::GetInstance()->AllowCaching(id);

}

const Extension* extension = GetExtensionById(id, true);

@@ -309,7 +307,7 @@ ExtensionService::ExtensionService(Profile* profile,

profile->GetPrefs(),

profile,

update_frequency,

- extensions::ExtensionsBrowserClient::Get()->GetExtensionCache(),

+ extensions::ExtensionCache::GetInstance(),

base::Bind(ChromeExtensionDownloaderFactory::CreateForProfile,

profile)));

}