Following https://codereview.chromium.org/355573008, the only code left in WebDataService deals with IE 7/8 password data, so move this into a separate (WIN only class) and kill WebDataService.

BUG=181277
TEST=Everything still works
TBR=noms@chromium.org, zea@chromium.org, phajdan.jr@chromium.org
TBR'ing for removal of unneeded includes and API changes in (c/b/profile, c/b/sync, and  c/test/base respectively).

Review URL: https://codereview.chromium.org/364343002

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

3 files changed, 1 insertions, 13 deletions

diff --git a/components/webdata/common/web_data_request_manager.h b/components/webdata/common/web_data_request_manager.h
index 90a5dd1..06d13e2 100644
--- a/components/webdata/common/web_data_request_manager.h
+++ b/components/webdata/common/web_data_request_manager.h
@@ -18,7 +18,6 @@
 #include "components/webdata/common/web_data_service_base.h"
 #include "components/webdata/common/web_data_service_consumer.h"
 
-class WebDataService;
 class WebDataServiceConsumer;
 class WebDataRequestManager;
 
diff --git a/components/webdata/common/web_data_service_test_util.cc b/components/webdata/common/web_data_service_test_util.cc
index b1f3429..0d91cdf 100644
--- a/components/webdata/common/web_data_service_test_util.cc
+++ b/components/webdata/common/web_data_service_test_util.cc
@@ -21,12 +21,10 @@ void MockWebDataServiceWrapperBase::Shutdown() {
 // will probably need a better way to create these mocks rather than passing
 // all the webdatas in.
 MockWebDataServiceWrapper::MockWebDataServiceWrapper(
-    scoped_refptr<WebDataService> fake_service,
     scoped_refptr<AutofillWebDataService> fake_autofill,
     scoped_refptr<TokenWebData> fake_token)
     : fake_autofill_web_data_(fake_autofill),
-      fake_token_web_data_(fake_token),
-      fake_web_data_(fake_service) {
+      fake_token_web_data_(fake_token) {
 }
 
 MockWebDataServiceWrapper::~MockWebDataServiceWrapper() {
@@ -40,7 +38,3 @@ scoped_refptr<AutofillWebDataService>
 scoped_refptr<TokenWebData> MockWebDataServiceWrapper::GetTokenWebData() {
   return fake_token_web_data_;
 }
-
-scoped_refptr<WebDataService> MockWebDataServiceWrapper::GetWebData() {
-  return fake_web_data_;
-}
diff --git a/components/webdata/common/web_data_service_test_util.h b/components/webdata/common/web_data_service_test_util.h
index d2223d4..68e6f4e 100644
--- a/components/webdata/common/web_data_service_test_util.h
+++ b/components/webdata/common/web_data_service_test_util.h
@@ -7,7 +7,6 @@
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "components/signin/core/browser/webdata/token_web_data.h"
 
@@ -29,7 +28,6 @@ class MockWebDataServiceWrapperBase : public WebDataServiceWrapper {
 class MockWebDataServiceWrapper : public MockWebDataServiceWrapperBase {
  public:
   MockWebDataServiceWrapper(
-      scoped_refptr<WebDataService> fake_service,
       scoped_refptr<autofill::AutofillWebDataService> fake_autofill,
       scoped_refptr<TokenWebData> fake_token);
 
@@ -40,12 +38,9 @@ class MockWebDataServiceWrapper : public MockWebDataServiceWrapperBase {
 
   virtual scoped_refptr<TokenWebData> GetTokenWebData() OVERRIDE;
 
-  virtual scoped_refptr<WebDataService> GetWebData() OVERRIDE;
-
  protected:
   scoped_refptr<autofill::AutofillWebDataService> fake_autofill_web_data_;
   scoped_refptr<TokenWebData> fake_token_web_data_;
-  scoped_refptr<WebDataService> fake_web_data_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapper);