More misc. cleanups to minimize future refactoring diffs.

chrome/browser/search_engines/search_provider_install_data.cc

Index: chrome/browser/search_engines/search_provider_install_data.cc
===================================================================
--- chrome/browser/search_engines/search_provider_install_data.cc	(revision 131375)
+++ chrome/browser/search_engines/search_provider_install_data.cc	(working copy)
@@ -129,8 +129,7 @@
                                 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.
@@ -145,9 +144,8 @@
                          const TemplateURL* template_url,
                          const SearchTermsData& search_terms_data) {
   DCHECK(requested_origin == requested_origin.GetOrigin());
-  return template_url && requested_origin ==

[sky, 2012/04/10 16:16:22]

How come it's safe to remove the template_url check here?

[Peter Kasting, 2012/04/10 17:53:44]

I wrote comments in patch set 1 for this and a few other places I thought needed
explanation -- see
http://codereview.chromium.org/10033017/diff/1/chrome/browser/search_engines/...
.  Basically, the answer is that this is called in one place and I don't think
that place can ever pass NULL.

-      TemplateURLService::GenerateSearchURLUsingTermsData(
-          template_url,
+  return requested_origin ==
+      TemplateURLService::GenerateSearchURLUsingTermsData(template_url,
           search_terms_data).GetOrigin();
 }