Get rid of WebKitContext. Only two out of six HTML5 related objects were in it and it was just a gl…

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_impl.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;
@@ skipping 125 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 = BrowserContext::GetWebKitContext(&profile);
-    IndexedDBContextImpl* idb_context = webkit_context->indexed_db_context();
+    IndexedDBContextImpl* idb_context =
+        static_cast<IndexedDBContextImpl*>(
+            BrowserContext::GetIndexedDBContext(&profile));
     idb_context->set_data_path_for_testing(temp_dir.path());
     protected_path = idb_context->GetFilePathForTesting(
         DatabaseUtil::GetOriginIdentifier(kProtectedOrigin));
     unprotected_path = idb_context->GetFilePathForTesting(
         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.
     idb_context->set_clear_local_state_on_exit(true);
@@ skipping 31 matching lines @@
     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 = BrowserContext::GetWebKitContext(&profile);
-    IndexedDBContextImpl* idb_context = webkit_context->indexed_db_context();
+    IndexedDBContextImpl* idb_context =
+        static_cast<IndexedDBContextImpl*>(
+            BrowserContext::GetIndexedDBContext(&profile));
 
     // 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->GetFilePathForTesting(
         DatabaseUtil::GetOriginIdentifier(kNormalOrigin));
     session_only_path = idb_context->GetFilePathForTesting(
         DatabaseUtil::GetOriginIdentifier(kSessionOnlyOrigin));
     ASSERT_TRUE(file_util::CreateDirectory(normal_path));
@@ skipping 34 matching lines @@
     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 = BrowserContext::GetWebKitContext(&profile);
-    IndexedDBContextImpl* idb_context = webkit_context->indexed_db_context();
+    IndexedDBContextImpl* idb_context =
+        static_cast<IndexedDBContextImpl*>(
+            BrowserContext::GetIndexedDBContext(&profile));
 
     // 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();
 
     normal_path = idb_context->GetFilePathForTesting(
@@ skipping 56 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"))));
 }