Move creation of BrowserContext objects that live in content to content, instead of depending on th…

chrome/browser/browsing_data_local_storage_helper.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/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::BrowserContext;
 using content::BrowserThread;
 using WebKit::WebSecurityOrigin;
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::LocalStorageInfo()
     : port(0),
       size(0) {
 }
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::LocalStorageInfo(
     const std::string& protocol,
@@ skipping 52 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
       base::Bind(
           &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread,
           this, file_path));
 }
 
 void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   file_util::FileEnumerator file_enumerator(
-      profile_->GetWebKitContext()->data_path().Append(
+      BrowserContext::GetWebKitContext(profile_)->data_path().Append(
           DOMStorageContext::kLocalStorageDirectory),
       false, file_util::FileEnumerator::FILES);
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() == DOMStorageContext::kLocalStorageExtension) {
       WebSecurityOrigin web_security_origin =
           WebSecurityOrigin::createFromDatabaseIdentifier(
               webkit_glue::FilePathToWebString(file_path.BaseName()));
       if (EqualsASCII(web_security_origin.protocol(),
                       chrome::kExtensionScheme)) {
@@ skipping 29 matching lines @@
   if (!completion_callback_.is_null()) {
     completion_callback_.Run(local_storage_info_);
     completion_callback_.Reset();
   }
   is_fetching_ = false;
 }
 
 void BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
-  profile_->GetWebKitContext()->dom_storage_context()->DeleteLocalStorageFile(
-      file_path);
+  BrowserContext::GetWebKitContext(profile_)->dom_storage_context()->
+      DeleteLocalStorageFile(file_path);
 }
 
 CannedBrowsingDataLocalStorageHelper::CannedBrowsingDataLocalStorageHelper(
     Profile* profile)
     : BrowsingDataLocalStorageHelper(profile),
       profile_(profile) {
 }
 
 CannedBrowsingDataLocalStorageHelper*
 CannedBrowsingDataLocalStorageHelper::Clone() {
@@ skipping 60 matching lines @@
     }
     if (duplicate)
       continue;
 
     local_storage_info_.push_back(LocalStorageInfo(
         web_security_origin.protocol().utf8(),
         web_security_origin.host().utf8(),
         web_security_origin.port(),
         web_security_origin.databaseIdentifier().utf8(),
         security_origin,
-        profile_->GetWebKitContext()->dom_storage_context()->
+        BrowserContext::GetWebKitContext(profile_)->dom_storage_context()->
             GetLocalStorageFilePath(web_security_origin.databaseIdentifier()),
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
                  this));
 }