Enough appcache + quota integration to call NotifyOriginInUse/NotifyOriginNoLongerInUse when frames are loaded/unloaded.

BUG=61676
TEST=appcache_host_unittest.cc
Review URL: http://codereview.chromium.org/6999008

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

3 files changed, 25 insertions, 27 deletions

diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 11b050c..198bd06 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -345,7 +345,7 @@ class ExtensionTestingProfile : public TestingProfile {
 
   virtual ChromeAppCacheService* GetAppCacheService() {
     if (!appcache_service_) {
-      appcache_service_ = new ChromeAppCacheService;
+      appcache_service_ = new ChromeAppCacheService(NULL);
       if (!BrowserThread::PostTask(
               BrowserThread::IO, FROM_HERE,
               NewRunnableMethod(
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 20e84ee..c87666c 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -270,19 +270,7 @@ class OffTheRecordProfileImpl : public Profile,
   }
 
   virtual ChromeAppCacheService* GetAppCacheService() {
-    if (!appcache_service_) {
-      appcache_service_ = new ChromeAppCacheService;
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              appcache_service_.get(),
-              &ChromeAppCacheService::InitializeOnIOThread,
-              IsOffTheRecord()
-                  ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
-              &GetResourceContext(),
-              make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
-              false));
-    }
+    CreateQuotaManagerAndClients();
     return appcache_service_;
   }
 
@@ -720,6 +708,17 @@ class OffTheRecordProfileImpl : public Profile,
         GetPath(), IsOffTheRecord(), GetExtensionSpecialStoragePolicy(),
         quota_manager_->proxy(),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
+    appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy());
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        NewRunnableMethod(
+            appcache_service_.get(),
+            &ChromeAppCacheService::InitializeOnIOThread,
+            IsOffTheRecord()
+                ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
+            &GetResourceContext(),
+            make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
+            false));
   }
 
   NotificationRegistrar registrar_;
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 4bf4a75..57716423 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -721,19 +721,7 @@ Profile* ProfileImpl::GetOriginalProfile() {
 }
 
 ChromeAppCacheService* ProfileImpl::GetAppCacheService() {
-  if (!appcache_service_) {
-    appcache_service_ = new ChromeAppCacheService;
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        NewRunnableMethod(
-            appcache_service_.get(),
-            &ChromeAppCacheService::InitializeOnIOThread,
-            IsOffTheRecord()
-                ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
-            &GetResourceContext(),
-            make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
-            clear_local_state_on_exit_));
-  }
+  CreateQuotaManagerAndClients();
   return appcache_service_;
 }
 
@@ -1303,6 +1291,17 @@ void ProfileImpl::CreateQuotaManagerAndClients() {
       GetPath(), IsOffTheRecord(), GetExtensionSpecialStoragePolicy(),
       quota_manager_->proxy(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
+  appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy());
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      NewRunnableMethod(
+          appcache_service_.get(),
+          &ChromeAppCacheService::InitializeOnIOThread,
+          IsOffTheRecord()
+              ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
+          &GetResourceContext(),
+          make_scoped_refptr(GetExtensionSpecialStoragePolicy()),
+          clear_local_state_on_exit_));
 }
 
 WebKitContext* ProfileImpl::GetWebKitContext() {