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

chrome/browser/browsing_data_local_storage_helper_browsertest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/thread_test_helper.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_helper_browsertest.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using content::DOMStorageContext;
 
 namespace {
 typedef
     BrowsingDataHelperCallback<BrowsingDataLocalStorageHelper::LocalStorageInfo>
         TestCompletionCallback;
 
 const FilePath::CharType kTestFile0[] =
     FILE_PATH_LITERAL("http_www.chromium.org_0.localstorage");
@@ skipping 16 matching lines @@
     const FilePath::CharType* kFilesToCreate[] = {
         kTestFile0, kTestFile1, kTestFileInvalid, kTestFileExtension
     };
     for (size_t i = 0; i < arraysize(kFilesToCreate); ++i) {
       FilePath file_path = storage_path.Append(kFilesToCreate[i]);
       file_util::WriteFile(file_path, NULL, 0);
     }
   }
 
   FilePath GetLocalStoragePathForTestingProfile() {
-    return DOMStorageContext::GetForBrowserContext(browser()->profile())->
+    return BrowserContext::GetDOMStorageContext(browser()->profile())->
         GetFilePath(ASCIIToUTF16("blah")).DirName();
   }
 };
 
 // This class is notified by BrowsingDataLocalStorageHelper on the UI thread
 // once it finishes fetching the local storage data.
 class StopTestOnCallback {
  public:
   explicit StopTestOnCallback(
       BrowsingDataLocalStorageHelper* local_storage_helper)
@@ skipping 116 matching lines @@
                  base::Unretained(&callback)));
 
   std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(FilePath(file).value(),
             result.begin()->file_path.BaseName().value());
 }
 }  // namespace