Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/ui/search_engines/search_engine_tab_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 11 matching lines @@
 using content::WebContents;
 
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
 bool IsFormSubmit(const NavigationEntry* entry) {
   return (content::PageTransitionStripQualifier(entry->GetTransitionType()) ==
           content::PAGE_TRANSITION_FORM_SUBMIT);
 }
 
-string16 GenerateKeywordFromNavigationEntry(const NavigationEntry* entry,
-                                            bool is_autodetected_provider) {
+string16 GenerateKeywordFromNavigationEntry(const NavigationEntry* entry) {
   // Don't autogenerate keywords for pages that are the result of form
   // submissions.
   if (IsFormSubmit(entry))
     return string16();
 
   // We want to use the user typed URL if available since that represents what
   // the user typed to get here, and fall back on the regular URL if not.
   GURL url = entry->GetUserTypedURL();
   if (!url.is_valid()) {
     url = entry->GetURL();
     if (!url.is_valid())
       return string16();
   }
 
-  return TemplateURLService::GenerateKeyword(url, is_autodetected_provider);
+  return TemplateURLService::GenerateKeyword(url, true);
 }
 
 }  // namespace
 
 SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
 SearchEngineTabHelper::~SearchEngineTabHelper() {
@@ skipping 20 matching lines @@
     const GURL& doc_url,
     const search_provider::OSDDType& msg_provider_type) {
   // Checks to see if we should generate a keyword based on the OSDD, and if
   // necessary uses TemplateURLFetcher to download the OSDD and create a
   // keyword.
 
   // Make sure page_id is the current page and other basic checks.
   DCHECK(doc_url.is_valid());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-  if (!web_contents()->IsActiveEntry(page_id))
-    return;
-  if (!profile->GetTemplateURLFetcher())
-    return;
-  if (profile->IsOffTheRecord())
+  if (!web_contents()->IsActiveEntry(page_id) ||
+      !profile->GetTemplateURLFetcher() || profile->IsOffTheRecord())
     return;
 
-  TemplateURLFetcher::ProviderType provider_type;
-  switch (msg_provider_type) {
-    case search_provider::AUTODETECTED_PROVIDER:
-      provider_type = TemplateURLFetcher::AUTODETECTED_PROVIDER;
-      break;
-
-    case search_provider::EXPLICIT_PROVIDER:
-      provider_type = TemplateURLFetcher::EXPLICIT_PROVIDER;
-      break;
-
-    default:
-      NOTREACHED();
-      return;
-  }
+  TemplateURLFetcher::ProviderType provider_type =
+      (msg_provider_type == search_provider::AUTODETECTED_PROVIDER) ?
+          TemplateURLFetcher::AUTODETECTED_PROVIDER :
+          TemplateURLFetcher::EXPLICIT_PROVIDER;
 
   // If the current page is a form submit, find the last page that was not a
   // form submit and use its url to generate the keyword from.
   const NavigationController& controller = web_contents()->GetController();
   const NavigationEntry* entry = controller.GetLastCommittedEntry();
   for (int index = controller.GetLastCommittedEntryIndex();
        (index > 0) && IsFormSubmit(entry);
        entry = controller.GetEntryAtIndex(index))
     --index;
   if (IsFormSubmit(entry))
     return;
 
-  string16 keyword = GenerateKeywordFromNavigationEntry(entry,
-      provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER);
+  // Autogenerate a keyword for the autodetected case; in the other cases we'll
+  // generate a keyword later after fetching the OSDD.
+  string16 keyword;
+  if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
+    keyword = GenerateKeywordFromNavigationEntry(entry);
+    if (keyword.empty())
+      return;
+  }
 
   // Download the OpenSearch description document. If this is successful, a
   // new keyword will be created when done.
   profile->GetTemplateURLFetcher()->ScheduleDownload(keyword, doc_url,
       entry->GetFavicon().url, web_contents(),
       new TemplateURLFetcherUICallbacks(this, web_contents()), provider_type);
 }
 
 void SearchEngineTabHelper::GenerateKeywordIfNecessary(
     const content::FrameNavigateParams& params) {
   if (!params.searchable_form_url.is_valid())
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (profile->IsOffTheRecord())
     return;
 
   const NavigationController& controller = web_contents()->GetController();
   int last_index = controller.GetLastCommittedEntryIndex();
   // When there was no previous page, the last index will be 0. This is
   // normally due to a form submit that opened in a new tab.
   // TODO(brettw) bug 916126: we should support keywords when form submits
   //              happen in new tabs.
   if (last_index <= 0)
     return;
+
   string16 keyword(GenerateKeywordFromNavigationEntry(
-      controller.GetEntryAtIndex(last_index - 1), true));
+      controller.GetEntryAtIndex(last_index - 1)));
   if (keyword.empty())
     return;
 
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (!url_service)
     return;
 
   if (!url_service->loaded()) {
     url_service->Load();
@@ skipping 26 matching lines @@
   // the favicon url wasn't obtained before the load started. This assumes the
   // latter.
   // TODO(sky): Need a way to set the favicon that doesn't involve generating
   // its url.
   const GURL& favicon_url = current_favicon.is_valid() ?
       current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);
   new_url->SetURL(url.spec(), 0, 0);
   new_url->SetFaviconURL(favicon_url);
   url_service->Add(new_url);
 }