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.h

 // 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.
 
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_
 #pragma once
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/time.h"
 #include "content/public/browser/dom_storage_context.h"
 
 class DOMStorageArea;
 class DOMStorageMessageFilter;
 class DOMStorageNamespace;
-class WebKitContext;
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
-// This is owned by WebKitContext and is all the dom storage information that's
+// This is owned by BrowserContext and is all the dom storage information that's
 // shared by all the DOMStorageMessageFilters that share the same browser
 // context.  The specifics of responsibilities are fairly well documented here
 // and in StorageNamespace and StorageArea.  Everything is only to be accessed
 // on the WebKit thread unless noted otherwise.
 class CONTENT_EXPORT DOMStorageContextImpl :
     NON_EXPORTED_BASE(public content::DOMStorageContext) {
  public:
-  DOMStorageContextImpl(WebKitContext* webkit_context,
+  // If |data_path| is empty, nothing will be saved to disk.
+  DOMStorageContextImpl(const FilePath& data_path,
                         quota::SpecialStoragePolicy* special_storage_policy);
   virtual ~DOMStorageContextImpl();
 
   // DOMStorageContext implementation:
   virtual std::vector<FilePath> GetAllStorageFiles() OVERRIDE;
   virtual FilePath GetFilePath(const string16& origin_id) const OVERRIDE;
   virtual void DeleteForOrigin(const string16& origin_id) OVERRIDE;
   virtual void DeleteLocalStorageFile(const FilePath& file_path) OVERRIDE;
   virtual void DeleteDataModifiedSince(const base::Time& cutoff) OVERRIDE;
 
@@ skipping 108 matching lines @@
   // Maps ids to StorageNamespaces.  We own these objects.
   typedef std::map<int64, DOMStorageNamespace*> StorageNamespaceMap;
   StorageNamespaceMap storage_namespace_map_;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContextImpl);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_IMPL_H_