Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/search_provider_install_data.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_DATA_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_DATA_H_
 #pragma once
 
 #include <string>
 
@@ skipping 28 matching lines @@
     INSTALLED_BUT_NOT_DEFAULT = 1,
 
     // The search provider is set as the user's default.
     INSTALLED_AS_DEFAULT = 2
   };
 
   // |ui_death_notification| and |ui_death_source| indentify a notification that
   // may be observed on the UI thread to know when this class no longer needs to
   // be kept up to date. (Note that this class may be deleted before or after
   // that notification occurs. It doesn't matter.)
-  SearchProviderInstallData(WebDataService* web_service,
+  SearchProviderInstallData(Profile* profile,

[sky, 2012/03/22 00:29:07]

I would prefer this to keep this taking a WDS. The reason I say that is that
this class is used on other threads. If you make it take a Profile it's all too
easy to make the profile a member and access from another thread - badness.

You said you're doing this because:
' Pass a Profile* to SearchProviderInstallData, which it will need for more
purposes once UIThreadSearchTermsData takes a Profile*.' Could you make
UIThreadSearchTermsData take the Profile but call this with the WDS?

[Peter Kasting, 2012/03/22 18:54:26]

The constructor here actually will need the Profile for multiple objects.  In
addition to the UIThreadSearchTermsData requiring a Profile to get the correct
Profile's Google URL, the GoogleURLObserver is also going to need to take a
Profile, so that when it's notified that the Google URL has changed, it can get
the correct Profile's new URL.

(I should probably also change the GoogleURLTracker from notifying AllSources to
using a source of |this| or of the relevant Profile.)

Given this, it's not clear to me how to avoid passing in the Profile.

                             int ui_death_notification,
                             const content::NotificationSource& ui_death_source);
   virtual ~SearchProviderInstallData();
 
   // Use to determine when the search provider information is loaded. The
   // callback may happen synchronously or asynchronously. There is no need to do
   // anything special to make it function (as it just relies on the normal I/O
   // thread message loop).
   void CallWhenLoaded(const base::Closure& closure);
 
@@ skipping 42 matching lines @@
   // The security origin for the default search provider.
   std::string default_search_origin_;
 
   // The google base url.
   std::string google_base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProviderInstallData);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_DATA_H_