Remove some dependencies on WebDataServiceFactory and WebDatabaseServiceFactory

Convert calls to WebDataServiceFactory::GetForProfile to WebDataService::FromBrowserContext in order to remove dependency on ProfileKeyedService from WebDataService and WebDatabaseService (for componentization).

TBR=ben@chromium.org
Test=unit_tests
BUG=181277


Review URL: https://chromiumcodereview.appspot.com/12566017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187965 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 11 deletions

diff --git a/chrome/browser/search_engines/search_provider_install_data.cc b/chrome/browser/search_engines/search_provider_install_data.cc
index a77921a..af77e8f 100644
--- a/chrome/browser/search_engines/search_provider_install_data.cc
+++ b/chrome/browser/search_engines/search_provider_install_data.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
@@ -161,8 +160,7 @@ SearchProviderInstallData::SearchProviderInstallData(
     Profile* profile,
     int ui_death_notification,
     const content::NotificationSource& ui_death_source)
-    : web_service_(WebDataServiceFactory::GetForProfile(profile,
-          Profile::EXPLICIT_ACCESS)),
+    : web_service_(WebDataService::FromBrowserContext(profile)),
       load_handle_(0),
       google_base_url_(UIThreadSearchTermsData(profile).GoogleBaseURLValue()) {
   // GoogleURLObserver is responsible for killing itself when
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 42773f3..48abb24 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -32,7 +32,7 @@
 #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/webdata/web_data_service_factory.h"
+#include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
@@ -687,8 +687,7 @@ void TemplateURLService::Load() {
     return;
 
   if (!service_.get()) {
-    service_ = WebDataServiceFactory::GetForProfile(profile_,
-                                                    Profile::EXPLICIT_ACCESS);
+    service_ = WebDataService::FromBrowserContext(profile_);
   }
 
   if (service_.get()) {
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index c9aa1f2..6807c50 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
+#include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_database_service_factory.h"
 #include "chrome/browser/webdata/web_database_service_impl.h"
 #include "chrome/common/chrome_constants.h"
@@ -200,8 +200,7 @@ void TemplateURLServiceTestUtil::ChangeModelToLoadState() {
   model()->ChangeToLoadedState();
   // Initialize the web data service so that the database gets updated with
   // any changes made.
-  model()->service_ = WebDataServiceFactory::GetForProfile(
-      profile_.get(), Profile::EXPLICIT_ACCESS);
+  model()->service_ = WebDataService::FromBrowserContext(profile_.get());
   BlockTillServiceProcessesRequests();
 }
 
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 742f0e8..060afea 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -1309,8 +1309,7 @@ TEST_F(TemplateURLServiceTest, FailedInit) {
 
   test_util_.ClearModel();
   WebDatabaseService* web_service =
-      WebDatabaseServiceFactory::GetForProfile(test_util_.profile(),
-                                               Profile::EXPLICIT_ACCESS);
+      WebDatabaseService::FromBrowserContext(test_util_.profile());
   web_service->UnloadDatabase();
 
   test_util_.ResetModel(false);