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_data_deleter.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 "chrome/browser/extensions/extension_data_deleter.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 34 matching lines @@
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteCookiesOnIOThread, deleter));
 
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteLocalStorageOnWebkitThread, deleter,
-          make_scoped_refptr(DOMStorageContext::GetForBrowserContext(
-              profile))));
+          make_scoped_refptr(BrowserContext::GetDOMStorageContext(profile))));
 
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteIndexedDBOnWebkitThread, deleter,
-          make_scoped_refptr(IndexedDBContext::GetForBrowserContext(profile))));
+          make_scoped_refptr(BrowserContext::GetIndexedDBContext(profile))));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteDatabaseOnFileThread, deleter));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &ExtensionDataDeleter::DeleteFileSystemOnFileThread, deleter));
@@ skipping 74 matching lines @@
   // See http://crbug.com/85127
   if (!isolated_app_path_.empty())
     file_util::Delete(isolated_app_path_, true);
 }
 
 void ExtensionDataDeleter::DeleteAppcachesOnIOThread(ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ResourceContext::GetAppCacheService(context)->DeleteAppCachesForOrigin(
       storage_origin_, net::CompletionCallback());
 }