Move creation of BrowserContext objects that live in content to content, instead of depending on th…

content/browser/in_process_webkit/indexed_db_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/thread_test_helper.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/in_process_webkit/indexed_db_context.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/database/database_util.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/special_storage_policy.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using quota::QuotaManager;
 using webkit_database::DatabaseUtil;
 
 // This browser test is aimed towards exercising the IndexedDB bindings and
 // the actual implementation that lives in the browser side (in_process_webkit).
 class IndexedDBBrowserTest : public InProcessBrowserTest {
  public:
   IndexedDBBrowserTest() {
     EnableDOMAutomation();
@@ skipping 110 matching lines @@
 
     // Test our assumptions about what is protected and what is not.
     const GURL kProtectedOrigin("chrome-extension://foo/");
     const GURL kUnprotectedOrigin("http://foo/");
     quota::SpecialStoragePolicy* policy = profile.GetSpecialStoragePolicy();
     ASSERT_TRUE(policy->IsStorageProtected(kProtectedOrigin));
     ASSERT_FALSE(policy->IsStorageProtected(kUnprotectedOrigin));
 
     // Create some indexedDB paths.
     // With the levelDB backend, these are directories.
-    WebKitContext *webkit_context = profile.GetWebKitContext();
+    WebKitContext* webkit_context = BrowserContext::GetWebKitContext(&profile);
     IndexedDBContext* idb_context = webkit_context->indexed_db_context();
     idb_context->set_data_path_for_testing(temp_dir.path());
     protected_path = idb_context->GetIndexedDBFilePath(
         DatabaseUtil::GetOriginIdentifier(kProtectedOrigin));
     unprotected_path = idb_context->GetIndexedDBFilePath(
         DatabaseUtil::GetOriginIdentifier(kUnprotectedOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(protected_path));
     ASSERT_TRUE(file_util::CreateDirectory(unprotected_path));
 
     // Setup to clear all unprotected origins on exit.
     webkit_context->set_clear_local_state_on_exit(true);
   }
 
   // Make sure we wait until the destructor has run.
-  scoped_refptr<base::ThreadTestHelper> helper(
+  scoped_refptr<base::ThreadTestHelper> helper_io(
+      new base::ThreadTestHelper(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
+  ASSERT_TRUE(helper_io->Run());
+  scoped_refptr<base::ThreadTestHelper> helper_webkit(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(
               BrowserThread::WEBKIT_DEPRECATED)));
-  ASSERT_TRUE(helper->Run());
+  ASSERT_TRUE(helper_webkit->Run());
 
   ASSERT_TRUE(file_util::DirectoryExists(protected_path));
   ASSERT_FALSE(file_util::DirectoryExists(unprotected_path));
 }
 
 // In proc browser test is needed here because ClearLocalState indirectly calls
 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin.
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearSessionOnlyDatabases) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   FilePath normal_path;
   FilePath session_only_path;
 
   // Create the scope which will ensure we run the destructor of the webkit
   // context which should trigger the clean up.
   {
     TestingProfile profile;
 
     const GURL kNormalOrigin("http://normal/");
     const GURL kSessionOnlyOrigin("http://session-only/");
     scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
         new quota::MockSpecialStoragePolicy;
     special_storage_policy->AddSessionOnly(kSessionOnlyOrigin);
 
     // Create some indexedDB paths.
     // With the levelDB backend, these are directories.
-    WebKitContext *webkit_context = profile.GetWebKitContext();
+    WebKitContext* webkit_context = BrowserContext::GetWebKitContext(&profile);
     IndexedDBContext* idb_context = webkit_context->indexed_db_context();
 
     // Override the storage policy with our own.
     idb_context->special_storage_policy_ = special_storage_policy;
     idb_context->set_data_path_for_testing(temp_dir.path());
 
     normal_path = idb_context->GetIndexedDBFilePath(
         DatabaseUtil::GetOriginIdentifier(kNormalOrigin));
     session_only_path = idb_context->GetIndexedDBFilePath(
         DatabaseUtil::GetOriginIdentifier(kSessionOnlyOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(normal_path));
     ASSERT_TRUE(file_util::CreateDirectory(session_only_path));
   }
 
-  // Make sure we wait until the destructor has run.
-  scoped_refptr<base::ThreadTestHelper> helper(
+  scoped_refptr<base::ThreadTestHelper> helper_io(
+      new base::ThreadTestHelper(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
+  ASSERT_TRUE(helper_io->Run());
+  scoped_refptr<base::ThreadTestHelper> helper_webkit(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(
               BrowserThread::WEBKIT_DEPRECATED)));
-  ASSERT_TRUE(helper->Run());
+  ASSERT_TRUE(helper_webkit->Run());
 
   EXPECT_TRUE(file_util::DirectoryExists(normal_path));
   EXPECT_FALSE(file_util::DirectoryExists(session_only_path));
 }
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, SaveSessionState) {
   ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   FilePath normal_path;
   FilePath session_only_path;
 
   // Create the scope which will ensure we run the destructor of the webkit
   // context.
   {
     TestingProfile profile;
 
     const GURL kNormalOrigin("http://normal/");
     const GURL kSessionOnlyOrigin("http://session-only/");
     scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy =
         new quota::MockSpecialStoragePolicy;
     special_storage_policy->AddSessionOnly(kSessionOnlyOrigin);
 
     // Create some indexedDB paths.
     // With the levelDB backend, these are directories.
-    WebKitContext *webkit_context = profile.GetWebKitContext();
+    WebKitContext* webkit_context = BrowserContext::GetWebKitContext(&profile);
     IndexedDBContext* idb_context = webkit_context->indexed_db_context();
 
     // Override the storage policy with our own.
     idb_context->special_storage_policy_ = special_storage_policy;
     idb_context->set_clear_local_state_on_exit(true);
     idb_context->set_data_path_for_testing(temp_dir.path());
 
     // Save session state. This should bypass the destruction-time deletion.
     idb_context->SaveSessionState();
 
@@ skipping 17 matching lines @@
   EXPECT_TRUE(file_util::DirectoryExists(session_only_path));
 }
 
 class IndexedDBBrowserTestWithLowQuota : public IndexedDBBrowserTest {
  public:
   virtual void SetUpOnMainThread() {
     const int kInitialQuotaKilobytes = 5000;
     const int kTemporaryStorageQuotaMaxSize = kInitialQuotaKilobytes
         * 1024 * QuotaManager::kPerHostTemporaryPortion;
     SetTempQuota(
-        kTemporaryStorageQuotaMaxSize, browser()->profile()->GetQuotaManager());
+        kTemporaryStorageQuotaMaxSize,
+        content::BrowserContext::GetQuotaManager(browser()->profile()));
   }
 
   static void SetTempQuota(int64 bytes, scoped_refptr<QuotaManager> qm) {
     if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&IndexedDBBrowserTestWithLowQuota::SetTempQuota, bytes,
                      qm));
       return;
     }
@@ skipping 18 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
   }
 };
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithGCExposed,
                        DatabaseCallbacksTest) {
   SimpleTest(
       testUrl(FilePath(FILE_PATH_LITERAL("database_callbacks_first.html"))));
 }