Misc. cleanup found while mucking with search engines code:

chrome/browser/webdata/web_data_service.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 "chrome/browser/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 25 matching lines @@
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
     builtin_keyword_version(0) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
 WebDataService::WebDataService(scoped_refptr<WebDatabaseService> wdbs,
                                const ProfileErrorCallback& callback)
-    : WebDataServiceBase(wdbs, callback,
+    : WebDataServiceBase(
+          wdbs, callback,
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keywords.
 //
 //////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddKeyword(const TemplateURLData& data) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::AddKeywordImpl, this, data));
 }
 
 void WebDataService::RemoveKeyword(TemplateURLID id) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::RemoveKeywordImpl, this, id));
 }
 
 void WebDataService::UpdateKeyword(const TemplateURLData& data) {
   wdbs_->ScheduleDBTask(
       FROM_HERE, Bind(&WebDataService::UpdateKeywordImpl, this, data));
 }
 
 WebDataServiceBase::Handle WebDataService::GetKeywords(
     WebDataServiceConsumer* consumer) {
-  return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
-      Bind(&WebDataService::GetKeywordsImpl, this), consumer);
+  return wdbs_->ScheduleDBTaskWithResult(
+      FROM_HERE, Bind(&WebDataService::GetKeywordsImpl, this), consumer);
 }
 
-void WebDataService::SetDefaultSearchProvider(const TemplateURL* url) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
-      Bind(&WebDataService::SetDefaultSearchProviderImpl, this,
-           url ? url->id() : 0));
+void WebDataService::SetDefaultSearchProviderID(TemplateURLID id) {
+  wdbs_->ScheduleDBTask(
+      FROM_HERE, Bind(&WebDataService::SetDefaultSearchProviderImpl, this, id));
 }
 
 void WebDataService::SetBuiltinKeywordVersion(int version) {
-  wdbs_->ScheduleDBTask(FROM_HERE,
+  wdbs_->ScheduleDBTask(
+      FROM_HERE,
       Bind(&WebDataService::SetBuiltinKeywordVersionImpl, this, version));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // Web Apps
 //
 //////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::SetWebAppImage(const GURL& app_url,
@@ skipping 16 matching lines @@
 
 WebDataServiceBase::Handle WebDataService::GetWebAppImages(
     const GURL& app_url, WebDataServiceConsumer* consumer) {
   return wdbs_->ScheduleDBTaskWithResult(FROM_HERE,
       Bind(&WebDataService::GetWebAppImagesImpl, this, app_url), consumer);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDataService::WebDataService()
-    : WebDataServiceBase(NULL, ProfileErrorCallback(),
+    : WebDataServiceBase(
+          NULL, ProfileErrorCallback(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)) {
 }
 
 WebDataService::~WebDataService() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::AddKeywordImpl(
     const TemplateURLData& data, WebDatabase* db) {
-  KeywordTable::FromWebDatabase(db)->AddKeyword(data);
-  return WebDatabase::COMMIT_NEEDED;
+  return KeywordTable::FromWebDatabase(db)->AddKeyword(data) ?
+      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::RemoveKeywordImpl(
     TemplateURLID id, WebDatabase* db) {
   DCHECK(id);
-  KeywordTable::FromWebDatabase(db)->RemoveKeyword(id);
-  return WebDatabase::COMMIT_NEEDED;
+  return KeywordTable::FromWebDatabase(db)->RemoveKeyword(id) ?
+      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::UpdateKeywordImpl(
     const TemplateURLData& data, WebDatabase* db) {
-  if (!KeywordTable::FromWebDatabase(db)->UpdateKeyword(data)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
- return WebDatabase::COMMIT_NEEDED;
+  return KeywordTable::FromWebDatabase(db)->UpdateKeyword(data) ?
+      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 scoped_ptr<WDTypedResult> WebDataService::GetKeywordsImpl(WebDatabase* db) {
+  scoped_ptr<WDTypedResult> result_ptr;
   WDKeywordsResult result;
-  KeywordTable::FromWebDatabase(db)->GetKeywords(&result.keywords);
-  result.default_search_provider_id =
-      KeywordTable::FromWebDatabase(db)->GetDefaultSearchProviderID();
-  result.builtin_keyword_version =
-      KeywordTable::FromWebDatabase(db)->GetBuiltinKeywordVersion();
-  return scoped_ptr<WDTypedResult>(
-      new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
+  if (KeywordTable::FromWebDatabase(db)->GetKeywords(&result.keywords)) {
+    result.default_search_provider_id =
+        KeywordTable::FromWebDatabase(db)->GetDefaultSearchProviderID();
+    result.builtin_keyword_version =
+        KeywordTable::FromWebDatabase(db)->GetBuiltinKeywordVersion();
+    result_ptr.reset(new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
+  }
+  return result_ptr.Pass();
 }
 
 WebDatabase::State WebDataService::SetDefaultSearchProviderImpl(
     TemplateURLID id, WebDatabase* db) {
-  if (!KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NEEDED;
+  return KeywordTable::FromWebDatabase(db)->SetDefaultSearchProviderID(id) ?
+      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 WebDatabase::State WebDataService::SetBuiltinKeywordVersionImpl(
     int version, WebDatabase* db) {
-  if (!KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version)) {
-    NOTREACHED();
-    return WebDatabase::COMMIT_NOT_NEEDED;
-  }
-  return WebDatabase::COMMIT_NEEDED;
+  return KeywordTable::FromWebDatabase(db)->SetBuiltinKeywordVersion(version) ?
+      WebDatabase::COMMIT_NEEDED : WebDatabase::COMMIT_NOT_NEEDED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Web Apps implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 WebDatabase::State WebDataService::SetWebAppImageImpl(
     const GURL& app_url, const SkBitmap& image, WebDatabase* db) {
@@ skipping 16 matching lines @@
 
 scoped_ptr<WDTypedResult> WebDataService::GetWebAppImagesImpl(
     const GURL& app_url, WebDatabase* db) {
   WDAppImagesResult result;
   result.has_all_images =
       WebAppsTable::FromWebDatabase(db)->GetWebAppHasAllImages(app_url);
   WebAppsTable::FromWebDatabase(db)->GetWebAppImages(app_url, &result.images);
   return scoped_ptr<WDTypedResult>(
       new WDResult<WDAppImagesResult>(WEB_APP_IMAGES, result));
 }