Initial refactor to get profiles to propagate storage partition details.

chrome/browser/extensions/data_deleter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/data_deleter.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/indexed_db_context.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_constants.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
@@ skipping 58 matching lines @@
   // http://crbug.com/85127
   database_tracker_ = BrowserContext::GetDefaultStoragePartition(profile)->
       GetDatabaseTracker();
   // Pick the right request context depending on whether it's an extension,
   // isolated app, or regular app.
   content::StoragePartition* storage_partition =
       BrowserContext::GetDefaultStoragePartition(profile);
   if (storage_origin.SchemeIs(chrome::kExtensionScheme)) {
     extension_request_context_ = profile->GetRequestContextForExtensions();
   } else if (is_storage_isolated) {
-    extension_request_context_ =
-        profile->GetRequestContextForStoragePartition(extension_id);
-    isolated_app_path_ =
-        profile->GetPath().Append(
-            content::StoragePartition::GetPartitionPath(extension_id));
+    const GURL& url = Extension::GetBaseURLFromExtensionId(extension_id);
+    content::StoragePartition* storage_partition =
+        BrowserContext::GetStoragePartitionForSite(profile, url);
+    // TODO(ajwong): Cookies are not properly isolated for
+    // chrome-extension:// scheme. See bug http://crbug.com/158386.
+    extension_request_context_ = storage_partition->GetURLRequestContext();
+    isolated_app_path_ = storage_partition->GetPath();
   } else {
     extension_request_context_ = profile->GetRequestContext();
   }
   file_system_context_ = storage_partition->GetFileSystemContext();
   indexed_db_context_ = storage_partition->GetIndexedDBContext();
 
   storage_origin_ = storage_origin;
   origin_id_ =
       webkit_database::DatabaseUtil::GetOriginIdentifier(storage_origin_);
 }
@@ skipping 35 matching lines @@
 }
 
 void DataDeleter::DeleteAppcachesOnIOThread(
     appcache::AppCacheService* appcache_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   appcache_service->DeleteAppCachesForOrigin(storage_origin_,
                                              net::CompletionCallback());
 }
 
 }  // namespace extensions