Misc. cleanup found while mucking with search engines code:

chrome/browser/webdata/web_data_service.h

 // 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
 #define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__
@@ skipping 103 matching lines @@
   // done.
 
   void AddKeyword(const TemplateURLData& data);
   void RemoveKeyword(TemplateURLID id);
   void UpdateKeyword(const TemplateURLData& data);
 
   // Fetches the keywords.
   // On success, consumer is notified with WDResult<KeywordTable::Keywords>.
   Handle GetKeywords(WebDataServiceConsumer* consumer);
 
-  // Sets the keywords used for the default search provider.
-  void SetDefaultSearchProvider(const TemplateURL* url);
+  // Sets the ID of the default search provider.
+  void SetDefaultSearchProviderID(TemplateURLID id);
 
   // Sets the version of the builtin keywords.
   void SetBuiltinKeywordVersion(int version);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Apps
   //
   //////////////////////////////////////////////////////////////////////////////
 
@@ skipping 44 matching lines @@
   //
   // The following methods are only invoked on the DB thread.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
   //
   //////////////////////////////////////////////////////////////////////////////
-  WebDatabase::State AddKeywordImpl(
-      const TemplateURLData& data, WebDatabase* db);
-  WebDatabase::State RemoveKeywordImpl(
-      TemplateURLID id, WebDatabase* db);
-  WebDatabase::State UpdateKeywordImpl(
-      const TemplateURLData& data, WebDatabase* db);
+  WebDatabase::State AddKeywordImpl(const TemplateURLData& data,
+                                    WebDatabase* db);
+  WebDatabase::State RemoveKeywordImpl(TemplateURLID id,
+                                       WebDatabase* db);
+  WebDatabase::State UpdateKeywordImpl(const TemplateURLData& data,
+                                       WebDatabase* db);
   scoped_ptr<WDTypedResult> GetKeywordsImpl(WebDatabase* db);
-  WebDatabase::State SetDefaultSearchProviderImpl(
-      TemplateURLID r, WebDatabase* db);
+  WebDatabase::State SetDefaultSearchProviderImpl(TemplateURLID r,
+                                                  WebDatabase* db);
   WebDatabase::State SetBuiltinKeywordVersionImpl(int version, WebDatabase* db);
 
   //////////////////////////////////////////////////////////////////////////////
   //
   // Web Apps.
   //
   //////////////////////////////////////////////////////////////////////////////
 
   WebDatabase::State SetWebAppImageImpl(const GURL& app_url,
       const SkBitmap& image, WebDatabase* db);
@@ skipping 40 matching lines @@
   WebDatabase::State RemoveIE7LoginImpl(
       const IE7PasswordInfo& info, WebDatabase* db);
   scoped_ptr<WDTypedResult> GetIE7LoginImpl(
       const IE7PasswordInfo& info, WebDatabase* db);
 #endif  // defined(OS_WIN)
 
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__