Adding support for DatabaseTracker messages to

DatabaseDispatcherHost. This code will get called as soon as we switch
from WebCore's DatabaseTracker implementation to Chromium's. Also,
cleaned up the pre-existing support for VFS messages.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/340067

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

2 files changed, 14 insertions, 3 deletions

diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 86e7eab..b718773 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_constants.h"
+#include "webkit/database/database_tracker.h"
 
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
 #include "chrome/browser/gtk/gtk_theme_provider.h"
@@ -182,6 +183,12 @@ void TestingProfile::UseThemeProvider(BrowserThemeProvider* theme_provider) {
   theme_provider_.reset(theme_provider);
 }
 
+webkit_database::DatabaseTracker* TestingProfile::GetDatabaseTracker() {
+  if (!db_tracker_)
+    db_tracker_ = new webkit_database::DatabaseTracker(GetPath());
+  return db_tracker_;
+}
+
 void TestingProfile::InitThemes() {
   if (!created_theme_provider_) {
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 0d13268..14b64da 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -18,7 +18,6 @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/common/pref_service.h"
 
-
 class TestingProfile : public Profile {
  public:
   TestingProfile();
@@ -76,6 +75,7 @@ class TestingProfile : public Profile {
   virtual void DestroyOffTheRecordProfile() {}
 
   virtual Profile* GetOriginalProfile() { return this; }
+  virtual webkit_database::DatabaseTracker* GetDatabaseTracker();
   virtual VisitedLinkMaster* GetVisitedLinkMaster() { return NULL; }
   virtual ExtensionsService* GetExtensionsService() { return NULL; }
   virtual UserScriptMaster* GetUserScriptMaster() { return NULL; }
@@ -241,6 +241,10 @@ class TestingProfile : public Profile {
 
   // Did the last session exit cleanly? Default is true.
   bool last_session_exited_cleanly_;
+
+  // The main database tracker for this profile.
+  // Should be used only on the file thread.
+  scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 };
 
 // A profile that derives from another profile.  This does not actually
@@ -248,8 +252,8 @@ class TestingProfile : public Profile {
 // site information.
 class DerivedTestingProfile : public TestingProfile {
  public:
-   DerivedTestingProfile(Profile* profile) : original_profile_(profile) {
-   }
+  explicit DerivedTestingProfile(Profile* profile)
+      : original_profile_(profile) {}
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();