Remove ExtensionService::IsExternalExtensionUninstalled()

extensions/browser/pending_extension_manager.cc

Index: extensions/browser/pending_extension_manager.cc
diff --git a/extensions/browser/pending_extension_manager.cc b/extensions/browser/pending_extension_manager.cc
index d16b92b9dfb7856109a408de3eee8becce1f9414..74c44c6db0de2fde3eb9dc9ad5c520d7994f9d82 100644
--- a/extensions/browser/pending_extension_manager.cc
+++ b/extensions/browser/pending_extension_manager.cc
@@ -10,6 +10,7 @@
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_prefs.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
@@ -31,9 +32,9 @@ std::string GetVersionString(const Version& version) {
 namespace extensions {
 
 PendingExtensionManager::PendingExtensionManager(
-    const ExtensionServiceInterface& service)
-    : service_(service) {
-}
+    const ExtensionServiceInterface& service,
+    content::BrowserContext* context)
+    : service_(service), context_(context) {}
 
 PendingExtensionManager::~PendingExtensionManager() {}
 
@@ -148,13 +149,12 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
   const bool kInstallSilently = true;
 
   const Extension* extension = service_.GetInstalledExtension(id);
-  if (extension &&
-      location == Manifest::GetHigherPriorityLocation(location,
-                                                       extension->location())) {
+  if (extension && location == Manifest::GetHigherPriorityLocation(
+                                   location, extension->location())) {
     // If the new location has higher priority than the location of an existing
     // extension, let the update process overwrite the existing extension.
   } else {
-    if (service_.IsExternalExtensionUninstalled(id))
+    if (ExtensionPrefs::Get(context_)->IsExternalExtensionUninstalled(id))

[Yoyo Zhou, 2014/03/18 01:23:37]

Could also use service->GetBrowserContext here.

[Devlin, 2014/03/18 17:24:12]

Actually, can't... |service_| is an ExtensionServiceInterface, which doesn't
have the GetBrowserContext method. Options:
1. Add a GetBrowserContext() to ExtensionServiceInterface (which also means
adding it to TestExtensionService).
2. Now that PendingExtensionManager is back in chrome/, it could take a real
ExtensionService.
3. Leave it like this.

Preferences?

[Yoyo Zhou, 2014/03/22 00:34:37]

May as well leave it as is for now then.

       return false;
 
     if (extension) {