Revert 136499 - Taking over issue 10006037.

Moved WebDataService to ProfileKeyedService 

James: 
chrome\browser\ui\intents 
Peter: 
chrome\browser\ui\search_engines 
chrome\browser\search_engines 
Nicolas: 
chrome\browser\sync 
Rachel/Elliot: 
chrome\browser\profiles and the whole cl 

BUG=112234
TEST=unit-tests 

TBR=jhawkins@chromium.org,pkasting@chromium.org,zea@chromium.org,erg@chromium.org,isherman@chromium.org

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

Reason of the revert: The CL broke the following linux_chromeos browser_tests.

EnterpriseLoginBlocksForEnterpriseUser_0
EnterpriseLoginBlocksForEnterpriseUser_1
EnterpriseLoginBlocksForEnterpriseUser_2
EnterpriseLoginBlocksForEnterpriseUser_3
EnterpriseLoginBlocksForEnterpriseUser_4
EnterpriseLoginBlocksForEnterpriseUser_5
EnterpriseLoginDoesntBlockForNormalUser
NormalLoginDoesntBlock

sample log:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%282%29/builds/1071/steps/browser_tests/logs/stdio

[14648:14648:0510/212507:358430278:FATAL:web_data_service.cc(96)] Check failed: BrowserThread::IsWellKnownThread(BrowserThread::DB). 
Backtrace:
	base::debug::StackTrace::StackTrace() [0x7ff2e9b74e76]
	logging::LogMessage::~LogMessage() [0x7ff2e9ba6627]
	WebDataService::WebDataService() [0x144d7a7]

TBR=rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10382123

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

2 files changed, 8 insertions, 10 deletions

diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index 57a135c..3878b63 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -11,8 +11,6 @@
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
-#include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -65,7 +63,10 @@ PasswordStoreFactory::PasswordStoreFactory()
     : RefcountedProfileKeyedServiceFactory(
         "PasswordStore",
         ProfileDependencyManager::GetInstance()) {
-  DependsOn(WebDataServiceFactory::GetInstance());
+  // TODO(erg): We must always depend on WebDB; we don't want the dependency
+  // graph to be different based on platform.
+  //
+  // DependsOn(WebDataServiceFactory::GetInstance());
 }
 
 PasswordStoreFactory::~PasswordStoreFactory() {}
@@ -107,7 +108,7 @@ PasswordStoreFactory::BuildServiceInstanceFor(Profile* profile) const {
 #if defined(OS_WIN)
   ps = new PasswordStoreWin(
       login_db, profile,
-      WebDataServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS));
+      profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
 #elif defined(OS_MACOSX)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseMockKeychain)) {
     ps = new PasswordStoreMac(new crypto::MockKeychain(), login_db);
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index ddcfa60..0d03e20 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -120,12 +120,8 @@ class PasswordStoreWinTest : public testing::Test {
   virtual void TearDown() {
     if (store_.get())
       store_->ShutdownOnUIThread();
-    wds_->ShutdownOnUIThread();
-    wds_ = NULL;
-    base::WaitableEvent done(false, false);
-    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
-    done.Wait();
+    if (wds_.get())
+      wds_->Shutdown();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
     db_thread_.Stop();
@@ -254,6 +250,7 @@ TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
   // Release the PSW and the WDS before the query can return.
   store_->ShutdownOnUIThread();
   store_ = NULL;
+  wds_->Shutdown();
   wds_ = NULL;
 
   MessageLoop::current()->RunAllPending();