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_context_impl.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 "content/browser/in_process_webkit/dom_storage_context_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 #include "content/browser/in_process_webkit/dom_storage_namespace.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/common/dom_storage_common.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.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"
 #include "webkit/quota/special_storage_policy.h"
 
-using content::BrowserContext;
 using content::BrowserThread;
 using content::DOMStorageContext;
 using WebKit::WebSecurityOrigin;
 
 const FilePath::CharType DOMStorageContextImpl::kLocalStorageDirectory[] =
     FILE_PATH_LITERAL("Local Storage");
 
 const FilePath::CharType DOMStorageContextImpl::kLocalStorageExtension[] =
     FILE_PATH_LITERAL(".localstorage");
 
@@ skipping 17 matching lines @@
           !special_storage_policy->IsStorageSessionOnly(origin)) {
         continue;
       }
       file_util::Delete(file_path, false);
     }
   }
 }
 
 }  // namespace
 
-DOMStorageContext* DOMStorageContext::GetForBrowserContext(
-    BrowserContext* context) {
-  return BrowserContext::GetWebKitContext(context)->dom_storage_context();
-}
-
 DOMStorageContextImpl::DOMStorageContextImpl(
-    WebKitContext* webkit_context,
+    const FilePath& data_path,
     quota::SpecialStoragePolicy* special_storage_policy)
     : last_storage_area_id_(0),
       last_session_storage_namespace_id_on_ui_thread_(kLocalStorageNamespaceId),
       last_session_storage_namespace_id_on_io_thread_(kLocalStorageNamespaceId),
       clear_local_state_on_exit_(false),
       save_session_state_(false),
       special_storage_policy_(special_storage_policy) {
-  data_path_ = webkit_context->data_path();
+  data_path_ = data_path;
 }
 
 DOMStorageContextImpl::~DOMStorageContextImpl() {
   // This should not go away until all DOM Storage message filters have gone
   // away.  And they remove themselves from this list.
   DCHECK(message_filter_set_.empty());
 
   for (StorageNamespaceMap::iterator iter(storage_namespace_map_.begin());
        iter != storage_namespace_map_.end(); ++iter) {
     delete iter->second;
@@ skipping 224 matching lines @@
       files.push_back(file_path);
   }
   return files;
 }
 
 FilePath DOMStorageContextImpl::GetFilePath(const string16& origin_id) const {
   FilePath storage_dir = data_path_.Append(kLocalStorageDirectory);
   FilePath::StringType id = webkit_glue::WebStringToFilePathString(origin_id);
   return storage_dir.Append(id.append(kLocalStorageExtension));
 }