5 files changed, 16 insertions, 42 deletions
diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc
index 18a0058..81cb971 100644
--- a/chrome/browser/extensions/context_menu_matcher.cc
+++ b/chrome/browser/extensions/context_menu_matcher.cc
@@ -6,30 +6,18 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
+#include "chrome/common/extensions/api/context_menus.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/common/context_menu_params.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/common/extensions/api/context_menus.h"
-#endif
-
 namespace extensions {
 
 namespace {
 
-int GetActionMenuTopLevelLimit() {
-#if defined(ENABLE_EXTENSIONS)
-  return api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT;
-#else
-  return 0;
-#endif
-}
-
 // The range of command IDs reserved for extension's custom menus.
 // TODO(oshima): These values will be injected by embedders.
 int extensions_context_custom_first = IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST;
@@ -77,7 +65,7 @@ void ContextMenuMatcher::AppendExtensionItems(
   MenuItem::List items;
   bool can_cross_incognito;
   if (!GetRelevantExtensionTopLevelItems(
-          extension_key, &extension, &can_cross_incognito, items))
+          extension_key, &extension, &can_cross_incognito, &items))
     return;
 
   if (items.empty())
@@ -151,7 +139,7 @@ base::string16 ContextMenuMatcher::GetTopLevelContextMenuTitle(
   MenuItem::List items;
   bool can_cross_incognito;
   GetRelevantExtensionTopLevelItems(
-      extension_key, &extension, &can_cross_incognito, items);
+      extension_key, &extension, &can_cross_incognito, &items);
 
   base::string16 title;
 
@@ -196,11 +184,10 @@ bool ContextMenuMatcher::GetRelevantExtensionTopLevelItems(
     const MenuItem::ExtensionKey& extension_key,
     const Extension** extension,
     bool* can_cross_incognito,
-    MenuItem::List& items) {
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(browser_context_)->extension_service();
-  *extension = service->GetExtensionById(extension_key.extension_id, false);
-
+    MenuItem::List* items) {
+  *extension = ExtensionRegistry::Get(
+      browser_context_)->enabled_extensions().GetByID(
+          extension_key.extension_id);
   if (!*extension)
     return false;
 
@@ -211,8 +198,7 @@ bool ContextMenuMatcher::GetRelevantExtensionTopLevelItems(
     return false;
 
   *can_cross_incognito = util::CanCrossIncognito(*extension, browser_context_);
-  items = GetRelevantExtensionItems(*all_items,
-                                    *can_cross_incognito);
+  *items = GetRelevantExtensionItems(*all_items, *can_cross_incognito);
 
   return true;
 }
@@ -264,8 +250,9 @@ void ContextMenuMatcher::RecursivelyAppendExtensionItems(
     // Action context menus have a limit for top level extension items to
     // prevent control items from being pushed off the screen, since extension
     // items will not be placed in a submenu.
+    const int top_level_limit = api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT;
     if (menu_id >= extensions_context_custom_last ||
-        (is_action_menu_top_level && num_items >= GetActionMenuTopLevelLimit()))
+        (is_action_menu_top_level && num_items >= top_level_limit))
       return;
 
     extension_item_map_[menu_id] = item->id();
diff --git a/chrome/browser/extensions/context_menu_matcher.h b/chrome/browser/extensions/context_menu_matcher.h
index ef44dac..1a825e0 100644
--- a/chrome/browser/extensions/context_menu_matcher.h
+++ b/chrome/browser/extensions/context_menu_matcher.h
@@ -72,7 +72,7 @@ class ContextMenuMatcher {
       const MenuItem::ExtensionKey& extension_key,
       const Extension** extension,
       bool* can_cross_incognito,
-      MenuItem::List& items);
+      MenuItem::List* items);
 
   MenuItem::List GetRelevantExtensionItems(
       const MenuItem::List& items,
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc
index acd5d09..2b875a2 100644
--- a/chrome/browser/extensions/data_deleter.cc
+++ b/chrome/browser/extensions/data_deleter.cc
@@ -75,7 +75,7 @@ void OnNeedsToGarbageCollectIsolatedStorage(WeakPtr<ExtensionService> es,
   callback.Run();
 }
 
-} // namespace
+}  // namespace
 
 // static
 void DataDeleter::StartDeleting(Profile* profile,
@@ -111,13 +111,11 @@ void DataDeleter::StartDeleting(Profile* profile,
     DeleteOrigin(profile, partition, extension->url(), callback);
   }
 
-#if defined(ENABLE_EXTENSIONS)
   // Begin removal of the settings for the current extension.
   // StorageFrontend may not exist in unit tests.
   StorageFrontend* frontend = StorageFrontend::Get(profile);
   if (frontend)
     frontend->DeleteStorageSoon(extension->id());
-#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6a2d145..5ea0e30 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -116,14 +116,12 @@ namespace {
 // Wait this many seconds after an extensions becomes idle before updating it.
 const int kUpdateIdleDelay = 5;
 
-#if defined(ENABLE_EXTENSIONS)
 scoped_ptr<IdentityProvider> CreateWebstoreIdentityProvider(Profile* profile) {
   return make_scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
       SigninManagerFactory::GetForProfile(profile),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       LoginUIServiceFactory::GetForProfile(profile)));
 }
-#endif  // defined(ENABLE_EXTENSIONS)
 
 }  // namespace
 
@@ -589,14 +587,12 @@ bool ExtensionService::UpdateExtension(const std::string& id,
 scoped_ptr<ExtensionDownloader> ExtensionService::CreateExtensionDownloader(
     ExtensionDownloaderDelegate* delegate) {
   scoped_ptr<ExtensionDownloader> downloader;
-#if defined(ENABLE_EXTENSIONS)
   scoped_ptr<IdentityProvider> identity_provider =
       CreateWebstoreIdentityProvider(profile_);
   downloader.reset(new ExtensionDownloader(
       delegate,
       profile_->GetRequestContext()));
   downloader->SetWebstoreIdentityProvider(identity_provider.Pass());
-#endif
   return downloader.Pass();
 }
 
diff --git a/chrome/browser/extensions/external_component_loader.cc b/chrome/browser/extensions/external_component_loader.cc
index f255d17..a80f441 100644
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -9,16 +9,12 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 
-// TODO(thestig): Remove after extensions are disabled on mobile.
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/search/hotword_service_factory.h"
-#endif
-
 namespace {
 
 bool IsUserSignedin(Profile* profile) {
@@ -37,9 +33,8 @@ ExternalComponentLoader::ExternalComponentLoader(Profile* profile)
 ExternalComponentLoader::~ExternalComponentLoader() {}
 
 // static
-bool ExternalComponentLoader::IsModifiable(
-    const extensions::Extension* extension) {
-  if (extension->location() == extensions::Manifest::EXTERNAL_COMPONENT) {
+bool ExternalComponentLoader::IsModifiable(const Extension* extension) {
+  if (extension->location() == Manifest::EXTERNAL_COMPONENT) {
     static const char* enhanced_extension_hashes[] = {
         "D5736E4B5CF695CB93A2FB57E4FDC6E5AFAB6FE2",  // http://crbug.com/312900
         "D57DE394F36DC1C3220E7604C575D29C51A6C495",  // http://crbug.com/319444
@@ -60,7 +55,6 @@ void ExternalComponentLoader::StartLoading() {
   prefs_->SetString(appId + ".external_update_url",
                     extension_urls::GetWebstoreUpdateUrl().spec());
 
-#if defined(ENABLE_EXTENSIONS)
   if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
     std::string hotwordId = extension_misc::kHotwordExtensionId;
     CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -71,7 +65,6 @@ void ExternalComponentLoader::StartLoading() {
                         extension_urls::GetWebstoreUpdateUrl().spec());
     }
   }
-#endif
 
   UpdateBookmarksExperimentState(
       profile_->GetPrefs(),