Rename IndexedDatabase to IDBFactory to match the spec

Review URL: http://codereview.chromium.org/2808083

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54304 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 19 insertions, 20 deletions

diff --git a/chrome/browser/in_process_webkit/indexed_db_context.cc b/chrome/browser/in_process_webkit/indexed_db_context.cc
index 6235833..ceaf8d9 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_context.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/in_process_webkit/indexed_db_context.h"
 
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
 
 using WebKit::WebIDBDatabase;
-using WebKit::WebIndexedDatabase;
+using WebKit::WebIDBFactory;
 
 IndexedDBContext::IndexedDBContext() {
 }
@@ -16,9 +16,9 @@ IndexedDBContext::IndexedDBContext() {
 IndexedDBContext::~IndexedDBContext() {
 }
 
-WebIndexedDatabase* IndexedDBContext::GetIndexedDatabase() {
-  if (!indexed_database_.get())
-    indexed_database_.reset(WebIndexedDatabase::create());
-  DCHECK(indexed_database_.get());
-  return indexed_database_.get();
+WebIDBFactory* IndexedDBContext::GetIDBFactory() {
+  if (!idb_factory_.get())
+    idb_factory_.reset(WebIDBFactory::create());
+  DCHECK(idb_factory_.get());
+  return idb_factory_.get();
 }
diff --git a/chrome/browser/in_process_webkit/indexed_db_context.h b/chrome/browser/in_process_webkit/indexed_db_context.h
index 828ea13..cb3ce05 100644
--- a/chrome/browser/in_process_webkit/indexed_db_context.h
+++ b/chrome/browser/in_process_webkit/indexed_db_context.h
@@ -11,7 +11,7 @@
 #include "base/scoped_ptr.h"
 
 namespace WebKit {
-class WebIndexedDatabase;
+class WebIDBFactory;
 }
 
 class IndexedDBContext {
@@ -21,10 +21,10 @@ class IndexedDBContext {
 
   // TODO(jorlow): If this is all this class ever does, then we should kill it
   //               and move this variable to WebKitContext.
-  WebKit::WebIndexedDatabase* GetIndexedDatabase();
+  WebKit::WebIDBFactory* GetIDBFactory();
 
  private:
-  scoped_ptr<WebKit::WebIndexedDatabase> indexed_database_;
+  scoped_ptr<WebKit::WebIDBFactory> idb_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBContext);
 };
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 352a334..3fd0714 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -16,8 +16,8 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabaseError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBIndex.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBObjectStore.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using WebKit::WebDOMStringList;
@@ -81,7 +81,7 @@ bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   DCHECK(process_handle_);
 
   switch (message.type()) {
-    case ViewHostMsg_IndexedDatabaseOpen::ID:
+    case ViewHostMsg_IDBFactoryOpen::ID:
     case ViewHostMsg_IDBDatabaseName::ID:
     case ViewHostMsg_IDBDatabaseDescription::ID:
     case ViewHostMsg_IDBDatabaseVersion::ID:
@@ -153,8 +153,8 @@ void IndexedDBDispatcherHost::OnMessageReceivedWebKit(
     handled = true;
     DCHECK(msg_is_ok);
     IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost, message, msg_is_ok)
-      IPC_MESSAGE_HANDLER(ViewHostMsg_IndexedDatabaseOpen,
-                          OnIndexedDatabaseOpen)
+      IPC_MESSAGE_HANDLER(ViewHostMsg_IDBFactoryOpen,
+                          OnIDBFactoryOpen)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
   }
@@ -178,19 +178,18 @@ int32 IndexedDBDispatcherHost::Add(WebIDBObjectStore* idb_object_store) {
   return object_store_dispatcher_host_->map_.Add(idb_object_store);
 }
 
-void IndexedDBDispatcherHost::OnIndexedDatabaseOpen(
-    const ViewHostMsg_IndexedDatabaseOpen_Params& params) {
+void IndexedDBDispatcherHost::OnIDBFactoryOpen(
+    const ViewHostMsg_IDBFactoryOpen_Params& params) {
   // TODO(jorlow): Check the content settings map and use params.routing_id_
   //               if it's necessary to ask the user for permission.
 
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
-  Context()->GetIndexedDatabase()->open(
+  Context()->GetIDBFactory()->open(
       params.name_, params.description_,
       new IndexedDBCallbacks<WebIDBDatabase>(this, params.response_id_),
       WebSecurityOrigin::createFromDatabaseIdentifier(params.origin_), NULL);
 }
 
-
 //////////////////////////////////////////////////////////////////////
 // Helper templates.
 //
diff --git a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 7bea48a..436b547 100644
--- a/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -15,8 +15,8 @@
 
 class IndexedDBKey;
 class SerializedScriptValue;
-struct ViewHostMsg_IndexedDatabaseOpen_Params;
 struct ViewHostMsg_IDBDatabaseCreateObjectStore_Params;
+struct ViewHostMsg_IDBFactoryOpen_Params;
 struct ViewHostMsg_IDBObjectStoreCreateIndex_Params;
 
 namespace WebKit {
@@ -65,7 +65,7 @@ class IndexedDBDispatcherHost
   // Message processing. Most of the work is delegated to the dispatcher hosts
   // below.
   void OnMessageReceivedWebKit(const IPC::Message& message);
-  void OnIndexedDatabaseOpen(const ViewHostMsg_IndexedDatabaseOpen_Params& p);
+  void OnIDBFactoryOpen(const ViewHostMsg_IDBFactoryOpen_Params& p);
 
   // Helper templates.
   template <class ReturnType>