Moved WebDataService to ProfileKeyedService

chrome/browser/search_engines/template_url_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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/sync/api/sync_change.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "net/base/net_util.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
@@ skipping 436 matching lines @@
 
 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) {
   model_observers_.RemoveObserver(observer);
 }
 
 void TemplateURLService::Load() {
   if (loaded_ || load_handle_)
     return;
 
   if (!service_.get())
-    service_ = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
+    service_ = WebDataServiceFactory::GetForProfile(profile_,
+                                                    Profile::EXPLICIT_ACCESS);

[Ilya Sherman, 2012/03/27 01:01:17]

nit: Please add curly braces.

[GeorgeY, 2012/03/30 19:20:12]

Done.

 
   if (service_.get()) {
     load_handle_ = service_->GetKeywords(this);
   } else {
     ChangeToLoadedState();
     NotifyLoaded();
   }
 }
 
 void TemplateURLService::OnWebDataServiceRequestDone(
@@ skipping 1405 matching lines @@
   dst->set_input_encodings(input_encodings);
   dst->set_show_in_default_list(specifics.show_in_default_list());
   dst->SetSuggestionsURL(specifics.suggestions_url(), 0, 0);
   dst->SetPrepopulateId(specifics.prepopulate_id());
   dst->set_autogenerate_keyword(specifics.autogenerate_keyword());
   dst->SetInstantURL(specifics.instant_url(), 0, 0);
   dst->set_last_modified(
       base::Time::FromInternalValue(specifics.last_modified()));
   dst->set_sync_guid(specifics.sync_guid());
 }