Correctly integrate StoragePartition into TestingProfile.

content/public/test/test_browser_context.cc

Index: content/public/test/test_browser_context.cc
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc
index 05f40e842e443b5156c2b5b948ed71a368391ac6..8d7c3e131bf27c026fd10ce3b7b67701f45ca146 100644
--- a/content/public/test/test_browser_context.cc
+++ b/content/public/test/test_browser_context.cc
@@ -9,6 +9,7 @@
 #include "content/public/test/mock_resource_context.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/quota/special_storage_policy.h"
 
@@ -16,13 +17,12 @@ namespace {
 
 class TestContextURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
-  explicit TestContextURLRequestContextGetter(net::URLRequestContext* context)
-      : context_(context),
-        null_task_runner_(new base::NullTaskRunner) {
+  TestContextURLRequestContextGetter()
+      : null_task_runner_(new base::NullTaskRunner) {
   }
 
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE {
-    return context_;
+    return &context_;
   }
 
   virtual scoped_refptr<base::SingleThreadTaskRunner>
@@ -33,7 +33,7 @@ class TestContextURLRequestContextGetter : public net::URLRequestContextGetter {
  private:
   virtual ~TestContextURLRequestContextGetter() {}
 
-  net::URLRequestContext* context_;
+  net::TestURLRequestContext context_;
   scoped_refptr<base::SingleThreadTaskRunner> null_task_runner_;
 };
 
@@ -71,8 +71,7 @@ DownloadManagerDelegate* TestBrowserContext::GetDownloadManagerDelegate() {
 
 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() {
   if (!request_context_.get()) {
-    request_context_ = new TestContextURLRequestContextGetter(
-        GetResourceContext()->GetRequestContext());
+    request_context_ = new TestContextURLRequestContextGetter();
   }
   return request_context_.get();
 }
@@ -101,7 +100,8 @@ TestBrowserContext::GetMediaRequestContextForStoragePartition(
 
 ResourceContext* TestBrowserContext::GetResourceContext() {
   if (!resource_context_)
-    resource_context_.reset(new MockResourceContext());
+    resource_context_.reset(new MockResourceContext(
+        GetRequestContext()->GetURLRequestContext()));
   return resource_context_.get();
 }