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

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__
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/location.h"
 #include "base/message_loop_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "content/public/browser/browser_thread.h"
 #include "sql/init_status.h"
 
 class AutocompleteSyncableService;
 class AutofillChange;
 class AutofillProfile;
 class AutofillProfileSyncableService;
 class CreditCard;
 struct DefaultWebIntentService;
 class GURL;
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 class MessageLoop;
 class Profile;
 class SkBitmap;
-class TemplateURL;
 class WebDatabase;
 
 namespace base {
 class Thread;
 }
 
 namespace webkit {
 namespace forms {
 struct FormField;
 struct PasswordForm;
@@ skipping 60 matching lines @@
 struct WDKeywordsResult {
   WDKeywordsResult();
   ~WDKeywordsResult();
 
   KeywordTable::Keywords keywords;
   // Identifies the ID of the TemplateURL that is the default search. A value of
   // 0 indicates there is no default search provider.
   int64 default_search_provider_id;
   // Version of the built-in keywords. A value of 0 indicates a first run.
   int builtin_keyword_version;
-  // Backup of the default search provider. NULL if the backup is invalid.
-  TemplateURL* default_search_provider_backup;
+  // Backup of the default search provider, and whether the backup is valid.
+  bool backup_valid;
+  TemplateURLData default_search_provider_backup;
   // Indicates if default search provider has been changed by something
   // other than user's action in the browser.
   bool did_default_search_provider_change;
 };
 
 //
 // The top level class for a result.
 //
 class WDTypedResult {
  public:
@@ skipping 194 matching lines @@
   // Keywords
   //
   //////////////////////////////////////////////////////////////////////////////
 
   // As the database processes requests at a later date, all deletion is
   // done on the background thread.
   //
   // Many of the keyword related methods do not return a handle. This is because
   // the caller (TemplateURLService) does not need to know when the request is
   // done.
+
   void AddKeyword(const TemplateURL& url);
-
-  void RemoveKeyword(const TemplateURL& url);
-
+  void RemoveKeyword(TemplateURLID id);
   void UpdateKeyword(const TemplateURL& url);
 
   // 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 version of the builtin keywords.
@@ skipping 240 matching lines @@
   //////////////////////////////////////////////////////////////////////////////
   //
   // The following methods are only invoked in the web data service thread.
   //
   //////////////////////////////////////////////////////////////////////////////
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<WebDataService>;
 
-  typedef GenericRequest2<std::vector<const TemplateURL*>,
+  typedef GenericRequest2<std::vector<const TemplateURLData*>,
                           KeywordTable::Keywords> SetKeywordsRequest;
 
   // Invoked on the main thread if initializing the db fails.
   void DBInitFailed(sql::InitStatus init_status);
 
   // Initialize the database, if it hasn't already been initialized.
   void InitializeDatabaseIfNecessary();
 
   // Initialize any syncable services.
   void InitializeSyncableServices();
@@ skipping 174 matching lines @@
   // result can be NULL, if no result is expected or if the database could
   // not be opened. The result object is destroyed after this call.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) = 0;
 
  protected:
   virtual ~WebDataServiceConsumer() {}
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_H__