Move indexed db files from content/renderer to content/common.

http://codereview.chromium.org/9375024/ enables indexed db in shared workers.

BUG=112855
TEST=


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

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

24 files changed, 124 insertions, 110 deletions

diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc
index 1514256..371c0cf 100644
--- a/content/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -253,6 +253,11 @@ ChildThread* ChildThread::current() {
   return ChildProcess::current()->main_thread();
 }
 
+bool ChildThread::IsWebFrameValid(WebKit::WebFrame* frame) {
+  // Return false so that it is overridden in any process in which it is used.
+  return false;
+}
+
 void ChildThread::OnProcessFinalRelease() {
   if (on_channel_error_called_) {
     MessageLoop::current()->Quit();
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index 4155a59..a63e87c 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -25,6 +25,10 @@ class SyncChannel;
 class SyncMessageFilter;
 }
 
+namespace WebKit {
+class WebFrame;
+}
+
 // The main thread of a child process derives from this class.
 class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
                                    public IPC::Message::Sender {
@@ -80,6 +84,8 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
   // Returns the one child thread.
   static ChildThread* current();
 
+  virtual bool IsWebFrameValid(WebKit::WebFrame* frame);
+
  protected:
   friend class ChildProcess;
 
diff --git a/content/renderer/indexed_db/indexed_db_dispatcher.cc b/content/common/indexed_db/indexed_db_dispatcher.cc
index 2770fbb..c8de358 100644
--- a/content/renderer/indexed_db/indexed_db_dispatcher.cc
+++ b/content/common/indexed_db/indexed_db_dispatcher.cc
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
+#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/renderer_webidbcursor_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbdatabase_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbindex_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbobjectstore_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
-#include "content/renderer/render_thread_impl.h"
-#include "content/renderer/render_view_impl.h"
+#include "content/common/indexed_db/proxy_webidbcursor_impl.h"
+#include "content/common/indexed_db/proxy_webidbdatabase_impl.h"
+#include "content/common/indexed_db/proxy_webidbindex_impl.h"
+#include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
+#include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
@@ -179,11 +178,9 @@ void IndexedDBDispatcher::RequestIDBFactoryOpen(
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
-  if (!web_frame)
-    return; // We must be shutting down.
-  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
-  if (!render_view)
-    return; // We must be shutting down.
+  if (!CurrentWorkerId() &&
+      !ChildThread::current()->IsWebFrameValid(web_frame))
+    return;
 
   IndexedDBHostMsg_FactoryOpen_Params params;
   params.thread_id = CurrentWorkerId();
@@ -200,11 +197,9 @@ void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames(
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
-  if (!web_frame)
-    return; // We must be shutting down.
-  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
-  if (!render_view)
-    return; // We must be shutting down.
+  if (!CurrentWorkerId() &&
+      !ChildThread::current()->IsWebFrameValid(web_frame))
+    return;
 
   IndexedDBHostMsg_FactoryGetDatabaseNames_Params params;
   params.thread_id = CurrentWorkerId();
@@ -221,11 +216,9 @@ void IndexedDBDispatcher::RequestIDBFactoryDeleteDatabase(
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
-  if (!web_frame)
-    return; // We must be shutting down.
-  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
-  if (!render_view)
-    return; // We must be shutting down.
+  if (!CurrentWorkerId() &&
+      !ChildThread::current()->IsWebFrameValid(web_frame))
+    return;
 
   IndexedDBHostMsg_FactoryDeleteDatabase_Params params;
   params.thread_id = CurrentWorkerId();
diff --git a/content/renderer/indexed_db/indexed_db_dispatcher.h b/content/common/indexed_db/indexed_db_dispatcher.h
index 29d520a..1872eeb 100644
--- a/content/renderer/indexed_db/indexed_db_dispatcher.h
+++ b/content/common/indexed_db/indexed_db_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
-#define CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #pragma once
 
 #include <map>
@@ -247,4 +247,4 @@ class IndexedDBDispatcher : public webkit_glue::WorkerTaskRunner::Observer {
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
diff --git a/content/renderer/indexed_db/indexed_db_message_filter.cc b/content/common/indexed_db/indexed_db_message_filter.cc
index 3e6b04b..b01aefa 100644
--- a/content/renderer/indexed_db/indexed_db_message_filter.cc
+++ b/content/common/indexed_db/indexed_db_message_filter.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/indexed_db_message_filter.h"
+#include "content/common/indexed_db/indexed_db_message_filter.h"
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
 #include "webkit/glue/worker_task_runner.h"
 
 using webkit_glue::WorkerTaskRunner;
diff --git a/content/renderer/indexed_db/indexed_db_message_filter.h b/content/common/indexed_db/indexed_db_message_filter.h
index e7d37f9..3486784 100644
--- a/content/renderer/indexed_db/indexed_db_message_filter.h
+++ b/content/common/indexed_db/indexed_db_message_filter.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
-#define CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
+#define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
 #pragma once
 
 #include "ipc/ipc_channel_proxy.h"
@@ -25,4 +25,4 @@ class IndexedDBMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DISALLOW_COPY_AND_ASSIGN(IndexedDBMessageFilter);
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
diff --git a/content/renderer/indexed_db/renderer_webidbcursor_impl.cc b/content/common/indexed_db/proxy_webidbcursor_impl.cc
index 52eaf57..a76878c 100644
--- a/content/renderer/indexed_db/renderer_webidbcursor_impl.cc
+++ b/content/common/indexed_db/proxy_webidbcursor_impl.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/renderer_webidbcursor_impl.h"
+#include "content/common/indexed_db/proxy_webidbcursor_impl.h"
 
+#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
 
 using WebKit::WebExceptionCode;
 using WebKit::WebIDBCallbacks;
diff --git a/content/renderer/indexed_db/renderer_webidbcursor_impl.h b/content/common/indexed_db/proxy_webidbcursor_impl.h
index aa386bb..31c8632 100644
--- a/content/renderer/indexed_db/renderer_webidbcursor_impl.h
+++ b/content/common/indexed_db/proxy_webidbcursor_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
 
 #include <deque>
 
@@ -72,4 +72,4 @@ class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
   enum { kMaxPrefetchAmount = 100 };
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBCURSOR_IMPL_H_
diff --git a/content/renderer/indexed_db/renderer_webidbdatabase_impl.cc b/content/common/indexed_db/proxy_webidbdatabase_impl.cc
index 6a07cc0..42df7671 100644
--- a/content/renderer/indexed_db/renderer_webidbdatabase_impl.cc
+++ b/content/common/indexed_db/proxy_webidbdatabase_impl.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/renderer_webidbdatabase_impl.h"
+#include "content/common/indexed_db/proxy_webidbdatabase_impl.h"
 
+#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db/renderer_webidbobjectstore_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
+#include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "webkit/glue/worker_task_runner.h"
diff --git a/content/renderer/indexed_db/renderer_webidbdatabase_impl.h b/content/common/indexed_db/proxy_webidbdatabase_impl.h
index 1f9b080..77b064f 100644
--- a/content/renderer/indexed_db/renderer_webidbdatabase_impl.h
+++ b/content/common/indexed_db/proxy_webidbdatabase_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_RENDERER_WEBIDBDATABASE_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBDATABASE_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -49,4 +49,4 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
   int32 idb_database_id_;
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBDATABASE_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBDATABASE_IMPL_H_
diff --git a/content/renderer/indexed_db/renderer_webidbfactory_impl.cc b/content/common/indexed_db/proxy_webidbfactory_impl.cc
index 166d92c..6a55ead 100644
--- a/content/renderer/indexed_db/renderer_webidbfactory_impl.cc
+++ b/content/common/indexed_db/proxy_webidbfactory_impl.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/renderer_webidbfactory_impl.h"
+#include "content/common/indexed_db/proxy_webidbfactory_impl.h"
 
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
diff --git a/content/renderer/indexed_db/renderer_webidbfactory_impl.h b/content/common/indexed_db/proxy_webidbfactory_impl.h
index 87fcdfe7..689c3a9 100644
--- a/content/renderer/indexed_db/renderer_webidbfactory_impl.h
+++ b/content/common/indexed_db/proxy_webidbfactory_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_RENDERER_WEBIDBFACTORY_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBFACTORY_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
 #pragma once
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
@@ -42,4 +42,4 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
       const WebKit::WebString& data_dir);
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBFACTORY_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBFACTORY_IMPL_H_
diff --git a/content/renderer/indexed_db/renderer_webidbindex_impl.cc b/content/common/indexed_db/proxy_webidbindex_impl.cc
index c7446e4..91bf66a 100644
--- a/content/renderer/indexed_db/renderer_webidbindex_impl.cc
+++ b/content/common/indexed_db/proxy_webidbindex_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/indexed_db/renderer_webidbindex_impl.h"
+#include "content/common/indexed_db/proxy_webidbindex_impl.h"
 
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 
diff --git a/content/renderer/indexed_db/renderer_webidbindex_impl.h b/content/common/indexed_db/proxy_webidbindex_impl.h
index 29e2c8f..59eafb2 100644
--- a/content/renderer/indexed_db/renderer_webidbindex_impl.h
+++ b/content/common/indexed_db/proxy_webidbindex_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBINDEX_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBINDEX_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -49,4 +49,4 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex {
   int32 idb_index_id_;
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBINDEX_IMPL_H_
diff --git a/content/renderer/indexed_db/renderer_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
index 9e1a002..ed70c41 100644
--- a/content/renderer/indexed_db/renderer_webidbobjectstore_impl.cc
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/renderer_webidbobjectstore_impl.h"
+#include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
 
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/public/common/serialized_script_value.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db/renderer_webidbindex_impl.h"
-#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/indexed_db/proxy_webidbindex_impl.h"
+#include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
diff --git a/content/renderer/indexed_db/renderer_webidbobjectstore_impl.h b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
index 18c4589..4921a2f 100644
--- a/content/renderer/indexed_db/renderer_webidbobjectstore_impl.h
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBOBJECTSTORE_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBOBJECTSTORE_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -75,4 +75,4 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
   int32 idb_object_store_id_;
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBOBJECTSTORE_IMPL_H_
diff --git a/content/renderer/indexed_db/renderer_webidbtransaction_impl.cc b/content/common/indexed_db/proxy_webidbtransaction_impl.cc
index f3db376..9e23fa5 100644
--- a/content/renderer/indexed_db/renderer_webidbtransaction_impl.cc
+++ b/content/common/indexed_db/proxy_webidbtransaction_impl.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/renderer/indexed_db/renderer_webidbtransaction_impl.h"
+#include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
 
 #include "content/common/indexed_db/indexed_db_messages.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db/renderer_webidbobjectstore_impl.h"
-#include "content/renderer/render_thread_impl.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
diff --git a/content/renderer/indexed_db/renderer_webidbtransaction_impl.h b/content/common/indexed_db/proxy_webidbtransaction_impl.h
index 164cdad..abe4134 100644
--- a/content/renderer/indexed_db/renderer_webidbtransaction_impl.h
+++ b/content/common/indexed_db/proxy_webidbtransaction_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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_RENDERER_INDEXED_DB_RENDERER_WEBIDBTRANSACTION_IMPL_H_
-#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBTRANSACTION_IMPL_H_
+#define CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBTRANSACTION_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -33,4 +33,4 @@ class RendererWebIDBTransactionImpl : public WebKit::WebIDBTransaction {
   int32 idb_transaction_id_;
 };
 
-#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PROXY_WEBIDBTRANSACTION_IMPL_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 49db28a..7389839 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -189,6 +189,22 @@
     'common/indexed_db/indexed_db_messages.h',
     'common/indexed_db/indexed_db_param_traits.cc',
     'common/indexed_db/indexed_db_param_traits.h',
+    'common/indexed_db/indexed_db_dispatcher.cc',
+    'common/indexed_db/indexed_db_dispatcher.h',
+    'common/indexed_db/indexed_db_message_filter.cc',
+    'common/indexed_db/indexed_db_message_filter.h',
+    'common/indexed_db/proxy_webidbcursor_impl.cc',
+    'common/indexed_db/proxy_webidbcursor_impl.h',
+    'common/indexed_db/proxy_webidbdatabase_impl.cc',
+    'common/indexed_db/proxy_webidbdatabase_impl.h',
+    'common/indexed_db/proxy_webidbfactory_impl.cc',
+    'common/indexed_db/proxy_webidbfactory_impl.h',
+    'common/indexed_db/proxy_webidbindex_impl.cc',
+    'common/indexed_db/proxy_webidbindex_impl.h',
+    'common/indexed_db/proxy_webidbobjectstore_impl.cc',
+    'common/indexed_db/proxy_webidbobjectstore_impl.h',
+    'common/indexed_db/proxy_webidbtransaction_impl.cc',
+    'common/indexed_db/proxy_webidbtransaction_impl.h',
     'common/inter_process_time_ticks_converter.cc',
     'common/inter_process_time_ticks_converter.h',
     'common/intents_messages.h',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index e08b3ae..0ddff189 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -64,22 +64,6 @@
     'renderer/gpu/input_event_filter.h',
     'renderer/idle_user_detector.cc',
     'renderer/idle_user_detector.h',
-    'renderer/indexed_db/indexed_db_dispatcher.cc',
-    'renderer/indexed_db/indexed_db_dispatcher.h',
-    'renderer/indexed_db/indexed_db_message_filter.cc',
-    'renderer/indexed_db/indexed_db_message_filter.h',
-    'renderer/indexed_db/renderer_webidbcursor_impl.cc',
-    'renderer/indexed_db/renderer_webidbcursor_impl.h',
-    'renderer/indexed_db/renderer_webidbdatabase_impl.cc',
-    'renderer/indexed_db/renderer_webidbdatabase_impl.h',
-    'renderer/indexed_db/renderer_webidbfactory_impl.cc',
-    'renderer/indexed_db/renderer_webidbfactory_impl.h',
-    'renderer/indexed_db/renderer_webidbindex_impl.cc',
-    'renderer/indexed_db/renderer_webidbindex_impl.h',
-    'renderer/indexed_db/renderer_webidbobjectstore_impl.cc',
-    'renderer/indexed_db/renderer_webidbobjectstore_impl.h',
-    'renderer/indexed_db/renderer_webidbtransaction_impl.cc',
-    'renderer/indexed_db/renderer_webidbtransaction_impl.h',
     'renderer/java/java_bridge_channel.cc',
     'renderer/java/java_bridge_channel.h',
     'renderer/java/java_bridge_dispatcher.cc',
diff --git a/content/renderer/indexed_db/OWNERS b/content/renderer/indexed_db/OWNERS
deleted file mode 100644
index 65287b4..0000000
--- a/content/renderer/indexed_db/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-dgrogan@chromium.org
-hans@chromium.org
-michaeln@chromium.org
-jsbell@chromium.org
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 27996e8..bb50ee5 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -28,6 +28,9 @@
 #include "content/common/dom_storage_messages.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
+#include "content/common/indexed_db/indexed_db_dispatcher.h"
+#include "content/common/indexed_db/indexed_db_message_filter.h"
+#include "content/common/indexed_db/proxy_webidbfactory_impl.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/resource_dispatcher.h"
@@ -41,9 +44,6 @@
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/gpu/compositor_thread.h"
-#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db/indexed_db_message_filter.h"
-#include "content/renderer/indexed_db/renderer_webidbfactory_impl.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
@@ -683,6 +683,17 @@ void RenderThreadImpl::ReleaseCachedFonts() {
 
 #endif  // OS_WIN
 
+bool RenderThreadImpl::IsWebFrameValid(WebKit::WebFrame* web_frame) {
+  if (!web_frame)
+    return false; // We must be shutting down.
+
+  RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_frame->view());
+  if (!render_view)
+    return false; // We must be shutting down.
+
+  return true;
+}
+
 bool RenderThreadImpl::IsMainThread() {
   return !!current();
 }
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 505f585..04c096d 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -121,6 +121,9 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
   virtual void ReleaseCachedFonts() OVERRIDE;
 #endif
 
+  // content::ChildThread:
+  virtual bool IsWebFrameValid(WebKit::WebFrame* frame) OVERRIDE;
+
   // GpuChannelHostFactory implementation:
   virtual bool IsMainThread() OVERRIDE;
   virtual bool IsIOThread() OVERRIDE;
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 063e5cf..2c1654a 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -14,6 +14,7 @@
 #include "content/common/file_system/webfilesystem_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/common/indexed_db/proxy_webidbfactory_impl.h"
 #include "content/common/mime_registry_messages.h"
 #include "content/common/npobject_util.h"
 #include "content/common/view_messages.h"
@@ -22,7 +23,6 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
-#include "content/renderer/indexed_db/renderer_webidbfactory_impl.h"
 #include "content/renderer/media/audio_device.h"
 #include "content/renderer/media/audio_hardware.h"
 #include "content/renderer/media/renderer_webaudiodevice_impl.h"