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_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/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_browser_context.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/special_storage_policy.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 typedef InProcessBrowserTest DOMStorageBrowserTest;
@@ skipping 53 matching lines @@
   FilePath temp_file_path_2 = domstorage_dir.Append(file_name_2);
 
   ASSERT_EQ(1, file_util::WriteFile(temp_file_path_1, ".", 1));
   ASSERT_EQ(1, file_util::WriteFile(temp_file_path_2, "o", 1));
 
   // Create the scope which will ensure we run the destructor of the webkit
   // context which should trigger the clean up.
   {
     TestBrowserContext browser_context;
     browser_context.SetSpecialStoragePolicy(new TestSpecialStoragePolicy());
-    WebKitContext* webkit_context = BrowserContext::GetWebKitContext(
-        &browser_context);
-    webkit_context->dom_storage_context()->
-        set_data_path_for_testing(temp_dir.path());
-    webkit_context->dom_storage_context()->set_clear_local_state_on_exit(true);
+    DOMStorageContextImpl* dom_storage_context =
+        static_cast<DOMStorageContextImpl*>(
+            BrowserContext::GetDOMStorageContext(&browser_context));
+    dom_storage_context->set_data_path_for_testing(temp_dir.path());
+    dom_storage_context->set_clear_local_state_on_exit(true);
   }
   // Make sure we wait until the destructor has run.
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(
               BrowserThread::WEBKIT_DEPRECATED)));
   ASSERT_TRUE(helper->Run());
 
   // Because we specified https for scheme to be skipped the second file
   // should survive and the first go into vanity.
   ASSERT_FALSE(file_util::PathExists(temp_file_path_1));
   ASSERT_TRUE(file_util::PathExists(temp_file_path_2));
 }