Remove the "autogenerate keyword" bit on TemplateURL.

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 129 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   return db_;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 //
 // 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);
+void WebDataService::AddKeyword(const TemplateURLData& data) {
+  GenericRequest<TemplateURLData>* request =
+      new GenericRequest<TemplateURLData>(this, GetNextRequestHandle(), NULL,
+                                          data);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE, Bind(&WebDataService::AddKeywordImpl, this, request));
 }
 
 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 =
-      new GenericRequest<TemplateURL>(this, GetNextRequestHandle(), NULL, url);
+void WebDataService::UpdateKeyword(const TemplateURLData& data) {
+  GenericRequest<TemplateURLData>* request =
+      new GenericRequest<TemplateURLData>(this, GetNextRequestHandle(), NULL,
+                                          data);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::UpdateKeywordImpl, this, request));
 }
 
 WebDataService::Handle WebDataService::GetKeywords(
                                        WebDataServiceConsumer* consumer) {
   WebDataRequest* request =
       new WebDataRequest(this, GetNextRequestHandle(), consumer);
   RegisterRequest(request);
@@ skipping 548 matching lines @@
   base::AutoLock l(pending_lock_);
   return ++next_request_handle_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Keywords implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-void WebDataService::AddKeywordImpl(GenericRequest<TemplateURL>* request) {
+void WebDataService::AddKeywordImpl(GenericRequest<TemplateURLData>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     db_->GetKeywordTable()->AddKeyword(request->arg());
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
 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) {
+void WebDataService::UpdateKeywordImpl(
+    GenericRequest<TemplateURLData>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     if (!db_->GetKeywordTable()->UpdateKeyword(request->arg())) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
   }
   request->RequestComplete();
 }
@@ skipping 710 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_));
 }