Remove unused param from search engine extension override helper function.

BUG=None
R=rdevlin.cronin@chromium.org, sky@chromium.org
TBR=sky

Review URL: https://codereview.chromium.org/312943002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276343 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/settings_api_bubble_controller.cc

@@ -95,14 +95,14 @@ bool SettingsApiBubbleDelegate::ShouldIncludeExtension(
 
   const Extension* override = NULL;
   switch (type_) {
-    case BUBBLE_TYPE_HOME_PAGE:
-      override = GetExtensionOverridingHomepage(profile_, NULL);
+    case extensions::BUBBLE_TYPE_HOME_PAGE:
+      override = extensions::GetExtensionOverridingHomepage(profile_);
       break;
-    case BUBBLE_TYPE_STARTUP_PAGES:
-      override = GetExtensionOverridingStartupPages(profile_, NULL);
+    case extensions::BUBBLE_TYPE_STARTUP_PAGES:
+      override = extensions::GetExtensionOverridingStartupPages(profile_);
       break;
-    case BUBBLE_TYPE_SEARCH_ENGINE:
-      override = GetExtensionOverridingSearchEngine(profile_, NULL);
+    case extensions::BUBBLE_TYPE_SEARCH_ENGINE:
+      override = extensions::GetExtensionOverridingSearchEngine(profile_);
       break;
   }
 

chrome/browser/extensions/settings_api_helpers.cc

@@ -13,10 +13,13 @@
 
 namespace extensions {
 
-const SettingsOverrides* FindOverridingExtension(
+namespace {
+
+// Returns which |extension| (if any) is overriding a particular |type| of
+// setting.
+const Extension* FindOverridingExtension(
     content::BrowserContext* browser_context,
-    SettingsApiOverrideType type,
-    const Extension** extension) {
+    SettingsApiOverrideType type) {
   const ExtensionSet& extensions =
       ExtensionRegistry::Get(browser_context)->enabled_extensions();
 
@@ -51,55 +54,29 @@ const SettingsOverrides* FindOverridingExtension(
           !preference_api->DoesExtensionControlPref((*it)->id(), key, NULL))
         continue;  // Not primary.
 
-      // Found the primary extension, return its setting.
-      *extension = *it;
-      return settings;
+      // Found the primary extension.
+      return *it;
     }
   }
 
   return NULL;
 }
 
+}  // namespace
+
 const Extension* GetExtensionOverridingHomepage(
-    content::BrowserContext* browser_context, GURL* home_page_url) {
-  const Extension* extension = NULL;
-  const SettingsOverrides* settings =
-      FindOverridingExtension(
-          browser_context, BUBBLE_TYPE_HOME_PAGE, &extension);
-
-  if (settings && home_page_url)
-    *home_page_url = *settings->homepage;
-  return extension;
+    content::BrowserContext* browser_context) {
+  return FindOverridingExtension(browser_context, BUBBLE_TYPE_HOME_PAGE);
 }
 
 const Extension* GetExtensionOverridingStartupPages(
-    content::BrowserContext* browser_context,
-    std::vector<GURL>* startup_pages) {
-  const Extension* extension = NULL;
-  const SettingsOverrides* settings =
-      FindOverridingExtension(
-          browser_context, BUBBLE_TYPE_STARTUP_PAGES, &extension);
-  if (settings && startup_pages) {
-    startup_pages->clear();
-    for (std::vector<GURL>::const_iterator it = settings->startup_pages.begin();
-         it != settings->startup_pages.end();
-         ++it)
-      startup_pages->push_back(GURL(*it));
-  }
-  return extension;
+    content::BrowserContext* browser_context) {
+  return FindOverridingExtension(browser_context, BUBBLE_TYPE_STARTUP_PAGES);
 }
 
 const Extension* GetExtensionOverridingSearchEngine(
-    content::BrowserContext* browser_context,
-    api::manifest_types::ChromeSettingsOverrides::Search_provider*
-        search_provider) {
-  const Extension* extension = NULL;
-  const SettingsOverrides* settings =
-      FindOverridingExtension(
-          browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);
-  if (settings && search_provider)
-    search_provider = settings->search_engine.get();
-  return extension;
+    content::BrowserContext* browser_context) {
+  return FindOverridingExtension(browser_context, BUBBLE_TYPE_SEARCH_ENGINE);
 }
 
 const Extension* GetExtensionOverridingProxy(

chrome/browser/extensions/settings_api_helpers.h

@@ -13,43 +13,23 @@ class BrowserContext;
 
 namespace extensions {
 
-struct SettingsOverrides;
-
-// Find which |extension| is overriding a particular |type| of setting. Returns
-// the SettingsOverride object, or NULL if no |extension| is overriding that
-// particular setting.
-const extensions::SettingsOverrides* FindOverridingExtension(
-    content::BrowserContext* browser_context,
-    SettingsApiOverrideType type,
-    const Extension** extension);
-
-// Returns which extension is overriding the homepage in a given
-// |browser_context| or NULL if no extension is overriding the homepage.
-// |home_page_url|, if non-NULL, will contain the home_page value the extension
-// has set.
+// Returns which extension (if any) is overriding the homepage in a given
+// |browser_context|.
 const Extension* GetExtensionOverridingHomepage(
-    content::BrowserContext* browser_context,
-    GURL* home_page_url);
+    content::BrowserContext* browser_context);
 
-// Returns which extension is overriding the homepage in a given
-// |browser_context| or NULL if no extension is overriding the startup pages.
-// |startup_pages|, if non-NULL, will contain the vector of startup page URLs
-// the extension has set.
+// Returns which extension (if any) is overriding the homepage in a given
+// |browser_context|.
 const Extension* GetExtensionOverridingStartupPages(
-    content::BrowserContext* browser_context,
-    std::vector<GURL>* startup_pages);
+    content::BrowserContext* browser_context);
 
-// Returns which extension is overriding the search engine in a given
-// |browser_context| or NULL if no extension is overriding the search engine.
-// |search_provider|, if non-NULL, will contain the search provider the
-// extension has set.
+// Returns which extension (if any) is overriding the search engine in a given
+// |browser_context|.
 const Extension* GetExtensionOverridingSearchEngine(
-    content::BrowserContext* browser_context,
-    api::manifest_types::ChromeSettingsOverrides::Search_provider*
-        search_provider);
+    content::BrowserContext* browser_context);
 
-// Returns which extension is overriding the proxy in a given |browser_context|
-// or NULL if no extension is overriding the proxy.
+// Returns which extension (if any) is overriding the proxy in a given
+// |browser_context|.
 const Extension* GetExtensionOverridingProxy(
     content::BrowserContext* browser_context);
 

chrome/browser/ui/views/extensions/extension_message_bubble_view.cc

@@ -348,8 +348,7 @@ bool ExtensionMessageBubbleFactory::MaybeShowStartupOverrideExtensionsBubble(
 #else
   DCHECK(!shown_startup_override_extensions_bubble_);
 
-  const Extension* extension =
-      GetExtensionOverridingStartupPages(profile_, NULL);
+  const Extension* extension = GetExtensionOverridingStartupPages(profile_);
   if (!extension)
     return false;
 

chrome/browser/ui/views/settings_api_bubble_helper_views.cc

@@ -52,7 +52,7 @@ void MaybeShowExtensionControlledHomeNotification(Browser* browser) {
 #endif
 
   const Extension* extension =
-      GetExtensionOverridingHomepage(browser->profile(), NULL);
+      GetExtensionOverridingHomepage(browser->profile());
   if (extension) {
     // The bubble will try to anchor itself against the home button
     views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)->
@@ -75,8 +75,7 @@ void MaybeShowExtensionControlledSearchNotification(
 
   if (AutocompleteMatch::IsSearchType(match.type) &&
       match.type != AutocompleteMatchType::SEARCH_OTHER_ENGINE) {
-    const Extension* extension =
-        GetExtensionOverridingSearchEngine(profile, NULL);
+    const Extension* extension = GetExtensionOverridingSearchEngine(profile);
     if (extension) {
       ToolbarView* toolbar =
           BrowserView::GetBrowserViewForBrowser(

chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1756,17 +1756,17 @@ void BrowserOptionsHandler::SetupExtensionControlledIndicators() {
   // Check if an extension is overriding the Search Engine.
   const extensions::Extension* extension =
       extensions::GetExtensionOverridingSearchEngine(
-          Profile::FromWebUI(web_ui()), NULL);
+          Profile::FromWebUI(web_ui()));
   AppendExtensionData("searchEngine", extension, &extension_controlled);
 
   // Check if an extension is overriding the Home page.
   extension = extensions::GetExtensionOverridingHomepage(
-      Profile::FromWebUI(web_ui()), NULL);
+      Profile::FromWebUI(web_ui()));
   AppendExtensionData("homePage", extension, &extension_controlled);
 
   // Check if an extension is overriding the Startup pages.
   extension = extensions::GetExtensionOverridingStartupPages(
-      Profile::FromWebUI(web_ui()), NULL);
+      Profile::FromWebUI(web_ui()));
   AppendExtensionData("startUpPage", extension, &extension_controlled);
 
   // Check if an extension is overriding the NTP page.