Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/search_engines/template_url_service_test_util.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_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 59 matching lines @@
   // Creates a new TemplateURLService.
   void ResetModel(bool verify_load);
 
   // Returns the search term from the last invocation of
   // TemplateURLService::SetKeywordSearchTermsForURL and clears the search term.
   string16 GetAndClearSearchTerm();
 
   // Set the google base url.
   void SetGoogleBaseURL(const std::string& base_url) const;
 
-  // Returns the WebDataService.
-  WebDataService* GetWebDataService();
-
   // Returns the TemplateURLService.
   TemplateURLService* model() const;
 
   // Returns the TestingProfile.
   TestingProfile* profile() const;
 
   // Starts an I/O thread.
   void StartIOThread();
 
  private:
   MessageLoopForUI message_loop_;
   // Needed to make the DeleteOnUIThread trait of WebDataService work
   // properly.
   content::TestBrowserThread ui_thread_;
   scoped_ptr<TemplateURLServiceTestingProfile> profile_;
   scoped_ptr<TestingTemplateURLService> model_;
   int changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTestUtil);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_TEST_UTIL_H_