Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/template_url_fetcher.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 "build/build_config.h"
 
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 113 matching lines @@
   DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
 
   if (!template_url_.get())
     return;
   AddSearchProvider();
   // WARNING: AddSearchProvider deletes us.
 }
 
 void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete(
     const content::URLFetcher* source) {
-  template_url_.reset(new TemplateURL());
-
   // Validation checks.
   // Make sure we can still replace the keyword, i.e. the fetch was successful.
   // If the OSDD file was loaded HTTP, we also have to check the response_code.
   // For other schemes, e.g. when the OSDD file is bundled with an extension,
   // the response_code is not applicable and should be -1. Also, ensure that
   // the returned information results in a valid search URL.
   std::string data;
   if (!source->GetStatus().is_success() ||
       ((source->GetResponseCode() != -1) &&
         (source->GetResponseCode() != 200)) ||
@@ skipping 32 matching lines @@
 
 void TemplateURLFetcher::RequestDelegate::AddSearchProvider() {
   DCHECK(template_url_.get());
   DCHECK(!keyword_.empty());
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
       fetcher_->profile());
   DCHECK(model);
   DCHECK(model->loaded());
 
   const TemplateURL* existing_url = NULL;
-  GURL gurl(template_url_->url()->url());
-  if (!model->CanReplaceKeyword(keyword_, gurl, &existing_url)) {
-    if (provider_type_ == AUTODETECTED_PROVIDER) {
-      fetcher_->RequestCompleted(this);
-      // WARNING: RequestCompleted deletes us.
-      return;
-    }
-
-    existing_url = NULL;
-
-    // If we're coming from JS (neither autodetected nor failure to load the
-    // template URL model) and this URL already exists in the model, we bring up
-    // the EditKeywordController to edit it.  This is helpful feedback in the
-    // case of clicking a button twice, and annoying in the case of a page that
-    // calls AddSearchProvider() in JS without a user action.
-    keyword_.clear();
+  if (model->CanReplaceKeyword(keyword_, GURL(template_url_->url()->url()),
+                               &existing_url)) {
+    if (existing_url)
+      model->Remove(existing_url);
+  } else if (provider_type_ == AUTODETECTED_PROVIDER) {
+    fetcher_->RequestCompleted(this);  // WARNING: Deletes us!
+    return;
   }
 
-  if (existing_url)
-    model->Remove(existing_url);
-
   // The short name is what is shown to the user. We preserve original names
   // since it is better when generated keyword in many cases.
   template_url_->set_keyword(keyword_);
   template_url_->set_originating_url(osdd_url_);
 
   // The page may have specified a URL to use for favicons, if not, set it.
   if (!template_url_->GetFaviconURL().is_valid())
     template_url_->SetFaviconURL(favicon_url_);
 
   switch (provider_type_) {
@@ skipping 35 matching lines @@
 void TemplateURLFetcher::ScheduleDownload(
     const string16& keyword,
     const GURL& osdd_url,
     const GURL& favicon_url,
     content::WebContents* web_contents,
     TemplateURLFetcherCallbacks* callbacks,
     ProviderType provider_type) {
   DCHECK(osdd_url.is_valid());
   scoped_ptr<TemplateURLFetcherCallbacks> owned_callbacks(callbacks);
 
-  // For JS added OSDD empty keyword is OK because we will generate keyword
-  // later from OSDD content.
-  if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER &&
-      keyword.empty())
-    return;
   TemplateURLService* url_model =
       TemplateURLServiceFactory::GetForProfile(profile());
   if (!url_model)
     return;
 
   // For a JS-added OSDD, the provided keyword is irrelevant because we will
   // generate a keyword later from the OSDD content.  For the autodetected case,
   // we need a valid keyword up front.
   if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
+    DCHECK(!keyword.empty());
+
     if (!url_model->loaded()) {
       // We could try to set up a callback to this function again once the model
       // is loaded but since this is an auto-add case anyway, meh.
       url_model->Load();
       return;
     }
 
     const TemplateURL* template_url =
         url_model->GetTemplateURLForKeyword(keyword);
     if (template_url && (!template_url->safe_for_autoreplace() ||
                          template_url->originating_url() == osdd_url))
       return;
   }
 
   // Make sure we aren't already downloading this request.
   for (Requests::iterator i = requests_->begin(); i != requests_->end(); ++i) {
-    if ((*i)->url() == osdd_url || (*i)->keyword() == keyword)
+    if (((*i)->url() == osdd_url) ||
+        ((provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) &&
+         ((*i)->keyword() == keyword)))
       return;
   }
 
   requests_->push_back(
       new RequestDelegate(this, keyword, osdd_url, favicon_url, web_contents,
                           owned_callbacks.release(), provider_type));
 }
 
 void TemplateURLFetcher::RequestCompleted(RequestDelegate* request) {
   Requests::iterator i =
       std::find(requests_->begin(), requests_->end(), request);
   DCHECK(i != requests_->end());
   requests_->erase(i);
   delete request;
 }