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

chrome/browser/extensions/extension_service_unittest.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 "chrome/browser/extensions/extension_service_unittest.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 3071 matching lines @@
   int64 size;
   db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size);
   db_tracker->DatabaseClosed(origin_id, db_name);
   std::vector<webkit_database::OriginInfo> origins;
   db_tracker->GetAllOriginsInfo(&origins);
   EXPECT_EQ(1U, origins.size());
   EXPECT_EQ(origin_id, origins[0].GetOrigin());
 
   // Create local storage. We only simulate this by creating the backing file
   // since webkit is not initialized.
-  DOMStorageContext* context = DOMStorageContext::GetForBrowserContext(
+  DOMStorageContext* context = BrowserContext::GetDOMStorageContext(
       profile_.get());
   FilePath lso_path = context->GetFilePath(origin_id);
   EXPECT_TRUE(file_util::CreateDirectory(lso_path.DirName()));
   EXPECT_EQ(0, file_util::WriteFile(lso_path, NULL, 0));
   EXPECT_TRUE(file_util::PathExists(lso_path));
 
   // Create indexed db. Similarly, it is enough to only simulate this by
   // creating the directory on the disk.
-  IndexedDBContext* idb_context = IndexedDBContext::GetForBrowserContext(
+  IndexedDBContext* idb_context = BrowserContext::GetIndexedDBContext(
       profile_.get());
   FilePath idb_path = idb_context->GetFilePathForTesting(origin_id);
   EXPECT_TRUE(file_util::CreateDirectory(idb_path));
   EXPECT_TRUE(file_util::DirectoryExists(idb_path));
 
   // Uninstall the extension.
   service_->UninstallExtension(good_crx, false, NULL);
   loop_.RunAllPending();
 
   // Check that the cookie is gone.
@@ skipping 80 matching lines @@
   int64 size;
   db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size);
   db_tracker->DatabaseClosed(origin_id, db_name);
   std::vector<webkit_database::OriginInfo> origins;
   db_tracker->GetAllOriginsInfo(&origins);
   EXPECT_EQ(1U, origins.size());
   EXPECT_EQ(origin_id, origins[0].GetOrigin());
 
   // Create local storage. We only simulate this by creating the backing file
   // since webkit is not initialized.
-  DOMStorageContext* context = DOMStorageContext::GetForBrowserContext(
+  DOMStorageContext* context = BrowserContext::GetDOMStorageContext(
       profile_.get());
   FilePath lso_path = context->GetFilePath(origin_id);
   EXPECT_TRUE(file_util::CreateDirectory(lso_path.DirName()));
   EXPECT_EQ(0, file_util::WriteFile(lso_path, NULL, 0));
   EXPECT_TRUE(file_util::PathExists(lso_path));
 
   // Create indexed db. Similarly, it is enough to only simulate this by
   // creating the directory on the disk.
-  IndexedDBContext* idb_context = IndexedDBContext::GetForBrowserContext(
+  IndexedDBContext* idb_context = BrowserContext::GetIndexedDBContext(
       profile_.get());
   FilePath idb_path = idb_context->GetFilePathForTesting(origin_id);
   EXPECT_TRUE(file_util::CreateDirectory(idb_path));
   EXPECT_TRUE(file_util::DirectoryExists(idb_path));
 
   // Uninstall one of them, unlimited storage should still be granted
   // to the origin.
   UninstallExtension(id1, false);
   EXPECT_EQ(1u, service_->extensions()->size());
   EXPECT_TRUE(profile_->GetExtensionSpecialStoragePolicy()->
@@ skipping 1562 matching lines @@
   ASSERT_FALSE(AddPendingSyncInstall());
 
   // Wait for the external source to install.
   WaitForCrxInstall(crx_path_, INSTALL_NEW);
   ASSERT_TRUE(IsCrxInstalled());
 
   // Now that the extension is installed, sync request should fail
   // because the extension is already installed.
   ASSERT_FALSE(AddPendingSyncInstall());
 }