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/indexed_db_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_INDEXED_DB_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_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/memory/scoped_ptr.h"
 #include "content/public/browser/indexed_db_context.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/quota/quota_types.h"
 
 class GURL;
 class FilePath;
-class WebKitContext;
 
 namespace WebKit {
 class WebIDBFactory;
 }
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace quota {
 class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
 class CONTENT_EXPORT IndexedDBContextImpl
     : NON_EXPORTED_BASE(public content::IndexedDBContext) {
  public:
-  IndexedDBContextImpl(WebKitContext* webkit_context,
+  // If |data_path| is empty, nothing will be saved to disk.
+  IndexedDBContextImpl(const FilePath& data_path,
                        quota::SpecialStoragePolicy* special_storage_policy,
                        quota::QuotaManagerProxy* quota_manager_proxy,
                        base::MessageLoopProxy* webkit_thread_loop);
 
   virtual ~IndexedDBContextImpl();
 
   WebKit::WebIDBFactory* GetIDBFactory();
 
   // The indexed db directory.
   static const FilePath::CharType kIndexedDBDirectory[];
@@ skipping 20 matching lines @@
 
   // Methods called by IndexedDBDispatcherHost for quota support.
   void ConnectionOpened(const GURL& origin_url);
   void ConnectionClosed(const GURL& origin_url);
   void TransactionComplete(const GURL& origin_url);
   bool WouldBeOverQuota(const GURL& origin_url, int64 additional_bytes);
   bool IsOverQuota(const GURL& origin_url);
 
   quota::QuotaManagerProxy* quota_manager_proxy();
 
+  FilePath data_path() const { return data_path_; }
+
   // For unit tests allow to override the |data_path_|.
   void set_data_path_for_testing(const FilePath& data_path) {
     data_path_ = data_path;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearLocalState);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, ClearSessionOnlyDatabases);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBBrowserTest, SaveSessionState);
   friend class IndexedDBQuotaClientTest;
@@ skipping 34 matching lines @@
   scoped_refptr<quota::QuotaManagerProxy> quota_manager_proxy_;
   scoped_ptr<std::set<GURL> > origin_set_;
   OriginToSizeMap origin_size_map_;
   OriginToSizeMap space_available_map_;
   std::map<GURL, unsigned int> connection_count_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBContextImpl);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CONTEXT_IMPL_H_