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/dom_storage_unittest.cc

 // Copyright (c) 2011 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/file_path.h"
 #include "base/file_util.h"
 #include "content/browser/browser_thread_impl.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"
 #include "content/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::BrowserThreadImpl;
 
 class DOMStorageTest : public testing::Test {
@@ skipping 31 matching lines @@
       domstorage_dir.Append(session_only_database);
   FilePath permanent_database_path =
       domstorage_dir.Append(permanent_database);
 
   ASSERT_TRUE(file_util::CreateDirectory(domstorage_dir));
 
   ASSERT_EQ(1, file_util::WriteFile(session_only_database_path, ".", 1));
   ASSERT_EQ(1, file_util::WriteFile(permanent_database_path, ".", 1));
 
   // Inject MockSpecialStoragePolicy into DOMStorageContext.
-  BrowserContext::GetWebKitContext(browser_context.get())->
-      dom_storage_context()->special_storage_policy_ = special_storage_policy;
+  DOMStorageContextImpl* dom_storage_context =
+      static_cast<DOMStorageContextImpl*>(
+          BrowserContext::GetDOMStorageContext(browser_context.get()));
+  dom_storage_context->special_storage_policy_ = special_storage_policy;
 
   // Delete the TestBrowserContext but own the temp dir. This way the
   // temporary data directory stays alive long enough to conduct the test.
   ScopedTempDir temp_dir;
   ignore_result(temp_dir.Set(browser_context->TakePath()));
   browser_context.reset();
   // Run the message loop to ensure that DOMStorageContext gets destroyed.
   message_loop_.RunAllPending();
 
   // Expected result: the database file for the permanent storage remains but
@@ skipping 24 matching lines @@
   FilePath permanent_database_path =
       domstorage_dir.Append(permanent_database);
 
   ASSERT_TRUE(file_util::CreateDirectory(domstorage_dir));
 
   ASSERT_EQ(1, file_util::WriteFile(session_only_database_path, ".", 1));
   ASSERT_EQ(1, file_util::WriteFile(permanent_database_path, ".", 1));
 
   // Inject MockSpecialStoragePolicy into DOMStorageContext.
   DOMStorageContextImpl* dom_storage_context =
-      BrowserContext::GetWebKitContext(browser_context.get())->
-          dom_storage_context();
+      static_cast<DOMStorageContextImpl*>(
+          BrowserContext::GetDOMStorageContext(browser_context.get()));
   dom_storage_context->special_storage_policy_ = special_storage_policy;
 
   dom_storage_context->set_clear_local_state_on_exit(true);
 
   // Save session state. This should bypass the destruction-time deletion.
   dom_storage_context->SaveSessionState();
 
   // Delete the TestBrowserContext but own the temp dir. This way the
   // temporary data directory stays alive long enough to conduct the test.
   ScopedTempDir temp_dir;
   ignore_result(temp_dir.Set(browser_context->TakePath()));
   browser_context.reset();
   // Run the message loop to ensure that DOMStorageContext gets destroyed.
   message_loop_.RunAllPending();
 
   // Expected result: no database files were deleted because of
   // SaveSessionState.
   EXPECT_TRUE(file_util::PathExists(session_only_database_path));
   EXPECT_TRUE(file_util::PathExists(permanent_database_path));
 }