Store a reference to the profile's DatabaseTracker in the request context too.

BUG=39368
TEST=existing tests apply

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

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

2 files changed, 15 insertions, 0 deletions

diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index c15bfd3..061ee29 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -881,6 +881,7 @@ ChromeURLRequestContext::ChromeURLRequestContext(
   extension_info_ = other->extension_info_;
   user_script_dir_path_ = other->user_script_dir_path_;
   appcache_service_ = other->appcache_service_;
+  database_tracker_ = other->database_tracker_;
   chrome_cookie_policy_ = other->chrome_cookie_policy_;
   host_content_settings_map_ = other->host_content_settings_map_;
   host_zoom_map_ = other->host_zoom_map_;
@@ -969,6 +970,8 @@ ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile)
   profile_dir_path_ = profile->GetPath();
 
   cookie_monster_delegate_ = new ChromeCookieMonsterDelegate(profile);
+
+  database_tracker_ = profile->GetDatabaseTracker();
 }
 
 ChromeURLRequestContextFactory::~ChromeURLRequestContextFactory() {
@@ -992,6 +995,7 @@ void ChromeURLRequestContextFactory::ApplyProfileParametersToContext(
   context->set_transport_security_state(
       transport_security_state_);
   context->set_ssl_config_service(ssl_config_service_);
+  context->set_database_tracker(database_tracker_);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index c9e0f99..d437824 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -23,6 +23,7 @@
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_registrar.h"
 #include "net/url_request/url_request_context.h"
+#include "webkit/database/database_tracker.h"
 
 class CommandLine;
 class Profile;
@@ -85,6 +86,11 @@ class ChromeURLRequestContext : public URLRequestContext {
     return appcache_service_.get();
   }
 
+  // Gets the database tracker associated with this context's profile.
+  webkit_database::DatabaseTracker* database_tracker() const {
+    return database_tracker_.get();
+  }
+
   bool is_off_the_record() const {
     return is_off_the_record_;
   }
@@ -201,6 +207,9 @@ class ChromeURLRequestContext : public URLRequestContext {
   void set_appcache_service(ChromeAppCacheService* service) {
     appcache_service_ = service;
   }
+  void set_database_tracker(webkit_database::DatabaseTracker* tracker) {
+    database_tracker_ = tracker;
+  }
   void set_net_log(net::NetLog* net_log) {
     net_log_ = net_log;
   }
@@ -218,6 +227,7 @@ class ChromeURLRequestContext : public URLRequestContext {
   FilePath user_script_dir_path_;
 
   scoped_refptr<ChromeAppCacheService> appcache_service_;
+  scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<ChromeCookiePolicy> chrome_cookie_policy_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
@@ -381,6 +391,7 @@ class ChromeURLRequestContextFactory {
   // user scripts.
   FilePath user_script_dir_path_;
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
+  scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;
   scoped_refptr<HostZoomMap> host_zoom_map_;
   scoped_refptr<Blacklist> privacy_blacklist_;
   scoped_refptr<net::TransportSecurityState> transport_security_state_;