Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/search_provider_install_data_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 171 matching lines @@
 };
 
 SearchProviderInstallDataTest::SearchProviderInstallDataTest()
     : install_data_(NULL) {
 }
 
 void SearchProviderInstallDataTest::SetUp() {
   testing::Test::SetUp();
   util_.SetUp();
   util_.StartIOThread();
-  install_data_ = new SearchProviderInstallData(util_.GetWebDataService(),
+  install_data_ = new SearchProviderInstallData(util_.profile(),
       content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
       content::Source<SearchProviderInstallDataTest>(this));
 }
 
 void SearchProviderInstallDataTest::TearDown() {
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, install_data_);
   install_data_ = NULL;
 
   // Make sure that the install data class on the UI thread gets cleaned up.
   // It doesn't matter that this happens after install_data_ is deleted.
@@ skipping 116 matching lines @@
   // Change the Google base url.
   google_host = "foo.com";
   util_.SetGoogleBaseURL("http://" + google_host + "/");
   // Wait for the I/O thread to process the update notification.
   TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
 
   // Verify that the change got picked up.
   test_get_install_state->set_search_provider_host(google_host);
   EXPECT_TRUE(test_get_install_state->RunTests());
 }