Remove dependency of WebData on content

components/autofill/browser/webdata/web_data_service_unittest.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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
+#include "chrome/browser/webdata/web_data_service.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/common/form_field_data.h"
-#include "components/webdata/common/web_data_service_test_util.h"
 #include "components/webdata/common/web_database_service.h"
+#include "components/webdata/common/web_data_results.h"
+#include "components/webdata/common/web_data_service_base.h"
+#include "components/webdata/common/web_data_service_consumer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
 using content::BrowserThread;
 using testing::_;
 using testing::DoDefault;
 using testing::ElementsAreArray;
 using testing::Pointee;
 using testing::Property;
 
+namespace {
+
+template <class T>
+class AutofillWebDataServiceConsumer: public WebDataServiceConsumer {
+ public:
+  AutofillWebDataServiceConsumer() : handle_(0) {}
+  virtual ~AutofillWebDataServiceConsumer() {}
+
+  virtual void OnWebDataServiceRequestDone(WebDataService::Handle handle,
+                                           const WDTypedResult* result) {
+    using content::BrowserThread;
+    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    handle_ = handle;
+    const WDResult<T>* wrapped_result =
+        static_cast<const WDResult<T>*>(result);
+    result_ = wrapped_result->GetValue();
+
+    base::MessageLoop::current()->Quit();
+  }
+
+  WebDataService::Handle handle() { return handle_; }
+  T& result() { return result_; }
+
+ private:
+  WebDataService::Handle handle_;
+  T result_;
+  DISALLOW_COPY_AND_ASSIGN(AutofillWebDataServiceConsumer);
+};
+
+}  // namespace
+
 namespace autofill {
 
 static const int kWebDataServiceTimeoutSeconds = 8;
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
 
 class MockAutofillWebDataServiceObserver
     : public AutofillWebDataServiceObserverOnDBThread {
@@ skipping 10 matching lines @@
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
  protected:
   virtual void SetUp() {
     db_thread_.Start();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB");
 
-    wdbs_ = new WebDatabaseService(path,
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI));
+    wdbs_ = new WebDatabaseService(
+        path,
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
     wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new AutofillTable("en-US")));
     wdbs_->LoadDatabase();
 
     wds_ = new AutofillWebDataService(
         wdbs_, WebDataServiceBase::ProfileErrorCallback());
     wds_->Init();
   }
 
   virtual void TearDown() {
     wds_->ShutdownOnUIThread();
@@ skipping 442 matching lines @@
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   base::MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }
 
 }  // namespace autofill