Make WebDataService no longer depend on ProfileKeyedService

chrome/browser/search_engines/template_url_service_test_util.h

Index: chrome/browser/search_engines/template_url_service_test_util.h
diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h
index ae4fe36127751714ba552e7da2d2413f850a789d..19ccc49d3fc9de366c0f02188e3e4a2edd42993f 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.h
+++ b/chrome/browser/search_engines/template_url_service_test_util.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #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/message_loop.h"
@@ -18,7 +19,6 @@
 
 class GURL;
 class TemplateURLService;
-class TemplateURLServiceTestingProfile;
 class TestingTemplateURLService;
 class TestingProfile;
 class WebDataService;
@@ -110,9 +110,12 @@ class TemplateURLServiceTestUtil : public TemplateURLServiceObserver {
  private:
   MessageLoopForUI message_loop_;
   // Needed to make the DeleteOnUIThread trait of WebDataService work
-  // properly.
+  // properly..
   content::TestBrowserThread ui_thread_;
-  scoped_ptr<TemplateURLServiceTestingProfile> profile_;
+  content::TestBrowserThread db_thread_;
+  content::TestBrowserThread io_thread_;
+  scoped_ptr<TestingProfile> profile_;
+  base::ScopedTempDir temp_dir_;
   int changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceTestUtil);