Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

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/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 54 matching lines @@
 }
 
 }  // namespace
 
 WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
-    builtin_keyword_version(0) {
+    builtin_keyword_version(0),
+    backup_valid(false),
+    did_default_search_provider_change(false) {
 }
 
 WDKeywordsResult::~WDKeywordsResult() {}
 
 WebDataService::WebDataService()
   : is_running_(false),
     db_(NULL),
     autocomplete_syncable_service_(NULL),
     autofill_profile_syncable_service_(NULL),
     failed_init_(false),
@@ skipping 59 matching lines @@
 //
 // Keywords.
 //
 //////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddKeyword(const TemplateURL& url) {
   // Ensure that the keyword is already generated (and cached) before caching
   // the TemplateURL for use on another keyword.
   url.EnsureKeyword();
   GenericRequest<TemplateURL>* request =
-    new GenericRequest<TemplateURL>(this, GetNextRequestHandle(), NULL, url);
+      new GenericRequest<TemplateURL>(this, GetNextRequestHandle(), NULL, url);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE, Bind(&WebDataService::AddKeywordImpl, this, request));
 }
 
-void WebDataService::RemoveKeyword(const TemplateURL& url) {
-  GenericRequest<TemplateURLID>* request = new GenericRequest<TemplateURLID>(
-      this, GetNextRequestHandle(), NULL, url.id());
+void WebDataService::RemoveKeyword(TemplateURLID id) {
+  GenericRequest<TemplateURLID>* request =
+      new GenericRequest<TemplateURLID>(this, GetNextRequestHandle(), NULL, id);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::RemoveKeywordImpl, this, request));
 }
 
 void WebDataService::UpdateKeyword(const TemplateURL& url) {
   // Ensure that the keyword is already generated (and cached) before caching
   // the TemplateURL for use on another keyword.
   url.EnsureKeyword();
   GenericRequest<TemplateURL>* request =
@@ skipping 648 matching lines @@
 
 void WebDataService::AddKeywordImpl(GenericRequest<TemplateURL>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     db_->GetKeywordTable()->AddKeyword(request->arg());
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
-void WebDataService::RemoveKeywordImpl(
-    GenericRequest<TemplateURLID>* request) {
+void WebDataService::RemoveKeywordImpl(GenericRequest<TemplateURLID>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     DCHECK(request->arg());
     db_->GetKeywordTable()->RemoveKeyword(request->arg());
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
 void WebDataService::UpdateKeywordImpl(GenericRequest<TemplateURL>* request) {
@@ skipping 12 matching lines @@
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     WDKeywordsResult result;
     db_->GetKeywordTable()->GetKeywords(&result.keywords);
     result.default_search_provider_id =
         db_->GetKeywordTable()->GetDefaultSearchProviderID();
     result.builtin_keyword_version =
         db_->GetKeywordTable()->GetBuiltinKeywordVersion();
     result.did_default_search_provider_change =
         db_->GetKeywordTable()->DidDefaultSearchProviderChange();
-    result.default_search_provider_backup =
-        result.did_default_search_provider_change ?
-        db_->GetKeywordTable()->GetDefaultSearchProviderBackup() :
-        NULL;
+    result.backup_valid = result.did_default_search_provider_change &&
+        db_->GetKeywordTable()->GetDefaultSearchProviderBackup(
+            &result.default_search_provider_backup);
     request->SetResult(
         new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
   }
   request->RequestComplete();
 }
 
 void WebDataService::SetDefaultSearchProviderImpl(
     GenericRequest<TemplateURLID>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
@@ skipping 773 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }