More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/search_provider_install_data.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/search_engines/search_provider_install_data.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 111 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, ui_death_notification, ui_death_source);
 }
 
 void GoogleURLObserver::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_GOOGLE_URL_UPDATED) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-        base::Bind(&GoogleURLChangeNotifier::OnChange,
-                   change_notifier_.get(),
+        base::Bind(&GoogleURLChangeNotifier::OnChange, change_notifier_.get(),
                    UIThreadSearchTermsData().GoogleBaseURLValue()));
   } else {
     // This must be the death notification.
     delete this;
   }
 }
 
 // Indicates if the two inputs have the same security origin.
 // |requested_origin| should only be a security origin (no path, etc.).
 // It is ok if |template_url| is NULL.
 static bool IsSameOrigin(const GURL& requested_origin,
                          const TemplateURL* template_url,
                          const SearchTermsData& search_terms_data) {
   DCHECK(requested_origin == requested_origin.GetOrigin());
-  return template_url && requested_origin ==

[Peter Kasting, 2012/04/10 01:24:33]

I don't think our lone caller will ever pass NULL here.

-      TemplateURLService::GenerateSearchURLUsingTermsData(
-          template_url,
+  return requested_origin ==
+      TemplateURLService::GenerateSearchURLUsingTermsData(template_url,
           search_terms_data).GetOrigin();
 }
 
 }  // namespace
 
 SearchProviderInstallData::SearchProviderInstallData(
     Profile* profile,
     int ui_death_notification,
     const content::NotificationSource& ui_death_source)
     : web_service_(profile->GetWebDataService(Profile::EXPLICIT_ACCESS)),
@@ skipping 133 matching lines @@
 
   std::for_each(closure_queue.begin(),
                 closure_queue.end(),
                 std::mem_fun_ref(&base::Closure::Run));
 
   // Since we expect this request to be rare, clear out the information. This
   // also keeps the responses current as the search providers change.
   provider_map_.reset();
   SetDefault(NULL);
 }