Moved WebDataService to ProfileKeyedService

chrome/test/base/chrome_render_view_host_test_harness.cc

Index: chrome/test/base/chrome_render_view_host_test_harness.cc
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc
index 950ade3902af56d5fdbf50cb345dcf34f6835a89..2b074b25b23e7197d742ccf7c0eed981f1c539dc 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
 
 #if defined(USE_ASH)
@@ -40,6 +41,11 @@ RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() {
 void ChromeRenderViewHostTestHarness::SetUp() {
   if (!browser_context_.get())
     browser_context_.reset(new TestingProfile());
+  // WebDataService is not used in ChromeRenderViewHostTest, but requires DB
+  // thread if instantiated.
+  WebDataServiceFactory::GetInstance()->SetTestingFactory(
+      Profile::FromBrowserContext(browser_context_.get()), NULL);
+
   RenderViewHostTestHarness::SetUp();
 }