Move indexeddb code to its own directory inside of content/{browser,common,renderer}

BUG=105949
TEST=


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

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

40 files changed, 123 insertions, 111 deletions

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9a155b5..206444f 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2738,9 +2738,9 @@
         '../content/browser/device_orientation/device_orientation_browsertest.cc',
         '../content/browser/download/mhtml_generation_browsertest.cc',
         '../content/browser/file_system/file_system_browsertest.cc',
-        '../content/browser/idbbindingutilities_browsertest.cc',
         '../content/browser/in_process_webkit/dom_storage_browsertest.cc',
         '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
+        '../content/browser/indexed_db/idbbindingutilities_browsertest.cc',
         '../content/browser/plugin_data_remover_impl_browsertest.cc',
         '../content/browser/plugin_service_browsertest.cc',
         '../content/browser/renderer_host/render_process_host_browsertest.cc',
diff --git a/content/browser/in_process_webkit/OWNERS b/content/browser/in_process_webkit/OWNERS
index 82eda2c..65287b4 100644
--- a/content/browser/in_process_webkit/OWNERS
+++ b/content/browser/in_process_webkit/OWNERS
@@ -1,3 +1,4 @@
 dgrogan@chromium.org
 hans@chromium.org
 michaeln@chromium.org
+jsbell@chromium.org
diff --git a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
index a1e94a1..58e6322 100644
--- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
+++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 #include "content/public/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
diff --git a/content/browser/in_process_webkit/indexed_db_callbacks.cc b/content/browser/in_process_webkit/indexed_db_callbacks.cc
index 9dcab25..ea1ee73 100644
--- a/content/browser/in_process_webkit/indexed_db_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_callbacks.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/in_process_webkit/indexed_db_callbacks.h"
 
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/quota/quota_manager.h"
 
 IndexedDBCallbacksBase::IndexedDBCallbacksBase(
diff --git a/content/browser/in_process_webkit/indexed_db_database_callbacks.cc b/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
index 18a7cae..1305be9 100644
--- a/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
@@ -5,7 +5,7 @@
 #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h"
 
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 
 IndexedDBDatabaseCallbacks::IndexedDBDatabaseCallbacks(
     IndexedDBDispatcherHost* dispatcher_host,
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index e138b13..8ad4901 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -11,7 +11,7 @@
 #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h"
 #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h"
 #include "content/browser/renderer_host/render_message_filter.h"
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
index abf62d7..b7270fb 100644
--- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
+++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
@@ -8,8 +8,8 @@
 #include "base/lazy_instance.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/browser/utility_process_host.h"
-#include "content/common/indexed_db_key.h"
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/common/utility_messages.h"
 #include "content/public/common/serialized_script_value.h"
 
diff --git a/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc b/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
index 000dc81..937dae4 100644
--- a/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
@@ -5,7 +5,7 @@
 #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h"
 
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 
 IndexedDBTransactionCallbacks::IndexedDBTransactionCallbacks(
     IndexedDBDispatcherHost* dispatcher_host,
diff --git a/content/browser/indexed_db/OWNERS b/content/browser/indexed_db/OWNERS
new file mode 100644
index 0000000..65287b4
--- /dev/null
+++ b/content/browser/indexed_db/OWNERS
@@ -0,0 +1,4 @@
+dgrogan@chromium.org
+hans@chromium.org
+michaeln@chromium.org
+jsbell@chromium.org
diff --git a/content/browser/idbbindingutilities_browsertest.cc b/content/browser/indexed_db/idbbindingutilities_browsertest.cc
index 2b34c09..f3b21f6 100644
--- a/content/browser/idbbindingutilities_browsertest.cc
+++ b/content/browser/indexed_db/idbbindingutilities_browsertest.cc
@@ -8,7 +8,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/utility_process_host.h"
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/utility_messages.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/serialized_script_value.h"
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index 3f7a55a..d00867a 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -19,7 +19,7 @@
 #include "content/common/gamepad_messages.h"
 #include "content/common/geolocation_messages.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/common/intents_messages.h"
 #include "content/common/java_bridge_messages.h"
 #include "content/common/media/audio_messages.h"
diff --git a/content/common/indexed_db/OWNERS b/content/common/indexed_db/OWNERS
new file mode 100644
index 0000000..65287b4
--- /dev/null
+++ b/content/common/indexed_db/OWNERS
@@ -0,0 +1,4 @@
+dgrogan@chromium.org
+hans@chromium.org
+michaeln@chromium.org
+jsbell@chromium.org
diff --git a/content/common/indexed_db_key.cc b/content/common/indexed_db/indexed_db_key.cc
index 4f76873..dd17e81 100644
--- a/content/common/indexed_db_key.cc
+++ b/content/common/indexed_db/indexed_db_key.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
diff --git a/content/common/indexed_db_key.h b/content/common/indexed_db/indexed_db_key.h
index 93daf7c..12b6a53 100644
--- a/content/common/indexed_db_key.h
+++ b/content/common/indexed_db/indexed_db_key.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_COMMON_INDEXED_DB_KEY_H_
-#define CONTENT_COMMON_INDEXED_DB_KEY_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_KEY_H_
+#define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_KEY_H_
 #pragma once
 
 #include <vector>
@@ -42,4 +42,4 @@ class CONTENT_EXPORT IndexedDBKey {
   double number_;
 };
 
-#endif  // CONTENT_COMMON_INDEXED_DB_KEY_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_KEY_H_
diff --git a/content/common/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h
index 82c4b29..9484b23 100644
--- a/content/common/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -6,8 +6,8 @@
 
 #include <vector>
 
-#include "content/common/indexed_db_key.h"
-#include "content/common/indexed_db_param_traits.h"
+#include "content/common/indexed_db/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_param_traits.h"
 #include "content/public/common/serialized_script_value.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
diff --git a/content/common/indexed_db_param_traits.cc b/content/common/indexed_db/indexed_db_param_traits.cc
index 5c3eb95..ac3d20f 100644
--- a/content/common/indexed_db_param_traits.cc
+++ b/content/common/indexed_db/indexed_db_param_traits.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/indexed_db_param_traits.h"
+#include "content/common/indexed_db/indexed_db_param_traits.h"
 
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 #include "content/public/common/serialized_script_value.h"
 #include "ipc/ipc_message_utils.h"
 
diff --git a/content/common/indexed_db_param_traits.h b/content/common/indexed_db/indexed_db_param_traits.h
index d94c1bd..3112342 100644
--- a/content/common/indexed_db_param_traits.h
+++ b/content/common/indexed_db/indexed_db_param_traits.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_COMMON_INDEXED_DB_PARAM_TRAITS_H_
-#define CONTENT_COMMON_INDEXED_DB_PARAM_TRAITS_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_PARAM_TRAITS_H_
+#define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_PARAM_TRAITS_H_
 #pragma once
 
 #include "ipc/ipc_message.h"
@@ -40,4 +40,4 @@ struct ParamTraits<IndexedDBKey> {
 
 } // namespace IPC
 
-#endif  // CONTENT_COMMON_INDEXED_DB_PARAM_TRAITS_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_PARAM_TRAITS_H_
diff --git a/content/common/utility_messages.h b/content/common/utility_messages.h
index 8d0f201..6972a55 100644
--- a/content/common/utility_messages.h
+++ b/content/common/utility_messages.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "content/common/indexed_db_key.h"
-#include "content/common/indexed_db_param_traits.h"
+#include "content/common/indexed_db/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_param_traits.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/serialized_script_value.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 1b83a30..229e4a5 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -169,11 +169,11 @@
     'common/hi_res_timer_manager_posix.cc',
     'common/hi_res_timer_manager_win.cc',
     'common/hi_res_timer_manager.h',
-    'common/indexed_db_key.cc',
-    'common/indexed_db_key.h',
-    'common/indexed_db_messages.h',
-    'common/indexed_db_param_traits.cc',
-    'common/indexed_db_param_traits.h',
+    'common/indexed_db/indexed_db_key.cc',
+    'common/indexed_db/indexed_db_key.h',
+    'common/indexed_db/indexed_db_messages.h',
+    'common/indexed_db/indexed_db_param_traits.cc',
+    'common/indexed_db/indexed_db_param_traits.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 57d2008..9421649 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -74,10 +74,22 @@
     'renderer/gpu/webgraphicscontext3d_command_buffer_impl.h',
     'renderer/idle_user_detector.cc',
     'renderer/idle_user_detector.h',
-    'renderer/indexed_db_dispatcher.cc',
-    'renderer/indexed_db_dispatcher.h',
-    'renderer/indexed_db_message_filter.cc',
-    'renderer/indexed_db_message_filter.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/intents_dispatcher.cc',
     'renderer/intents_dispatcher.h',
     'renderer/java/java_bridge_channel.cc',
@@ -164,18 +176,6 @@
     'renderer/renderer_webaudiodevice_impl.h',
     'renderer/renderer_webcookiejar_impl.cc',
     'renderer/renderer_webcookiejar_impl.h',
-    'renderer/renderer_webidbcursor_impl.cc',
-    'renderer/renderer_webidbcursor_impl.h',
-    'renderer/renderer_webidbdatabase_impl.cc',
-    'renderer/renderer_webidbdatabase_impl.h',
-    'renderer/renderer_webidbfactory_impl.cc',
-    'renderer/renderer_webidbfactory_impl.h',
-    'renderer/renderer_webidbindex_impl.cc',
-    'renderer/renderer_webidbindex_impl.h',
-    'renderer/renderer_webidbobjectstore_impl.cc',
-    'renderer/renderer_webidbobjectstore_impl.h',
-    'renderer/renderer_webidbtransaction_impl.cc',
-    'renderer/renderer_webidbtransaction_impl.h',
     'renderer/renderer_webkitplatformsupport_impl.cc',
     'renderer/renderer_webkitplatformsupport_impl.h',
     'renderer/renderer_webstoragearea_impl.cc',
diff --git a/content/renderer/indexed_db/OWNERS b/content/renderer/indexed_db/OWNERS
new file mode 100644
index 0000000..65287b4
--- /dev/null
+++ b/content/renderer/indexed_db/OWNERS
@@ -0,0 +1,4 @@
+dgrogan@chromium.org
+hans@chromium.org
+michaeln@chromium.org
+jsbell@chromium.org
diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db/indexed_db_dispatcher.cc
index d7e8d6b..4ad0ab5 100644
--- a/content/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db/indexed_db_dispatcher.cc
@@ -2,18 +2,18 @@
 // 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_dispatcher.h"
+#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
-#include "content/common/indexed_db_messages.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/renderer/renderer_webidbcursor_impl.h"
-#include "content/renderer/renderer_webidbdatabase_impl.h"
-#include "content/renderer/renderer_webidbindex_impl.h"
-#include "content/renderer/renderer_webidbobjectstore_impl.h"
-#include "content/renderer/renderer_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"
diff --git a/content/renderer/indexed_db_dispatcher.h b/content/renderer/indexed_db/indexed_db_dispatcher.h
index a813ed3..29d520a 100644
--- a/content/renderer/indexed_db_dispatcher.h
+++ b/content/renderer/indexed_db/indexed_db_dispatcher.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_DISPATCHER_H_
-#define CONTENT_RENDERER_INDEXED_DB_DISPATCHER_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
+#define CONTENT_RENDERER_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_DISPATCHER_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
diff --git a/content/renderer/indexed_db_message_filter.cc b/content/renderer/indexed_db/indexed_db_message_filter.cc
index c6dac1a0..3e6b04b 100644
--- a/content/renderer/indexed_db_message_filter.cc
+++ b/content/renderer/indexed_db/indexed_db_message_filter.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_message_filter.h"
+#include "content/renderer/indexed_db/indexed_db_message_filter.h"
 
 #include "base/bind.h"
 #include "base/location.h"
-#include "content/common/indexed_db_messages.h"
-#include "content/renderer/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_message_filter.h b/content/renderer/indexed_db/indexed_db_message_filter.h
index 2302c66..e7d37f9 100644
--- a/content/renderer/indexed_db_message_filter.h
+++ b/content/renderer/indexed_db/indexed_db_message_filter.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_MESSAGE_FILTER_H_
-#define CONTENT_RENDERER_INDEXED_DB_MESSAGE_FILTER_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_MESSAGE_FILTER_H_
+#define CONTENT_RENDERER_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_DISPATCHER_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
diff --git a/content/renderer/renderer_webidbcursor_impl.cc b/content/renderer/indexed_db/renderer_webidbcursor_impl.cc
index e5e0f29..52eaf57 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/indexed_db/renderer_webidbcursor_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_webidbcursor_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbcursor_impl.h"
 
-#include "content/common/indexed_db_messages.h"
-#include "content/renderer/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/render_thread_impl.h"
 
 using WebKit::WebExceptionCode;
diff --git a/content/renderer/renderer_webidbcursor_impl.h b/content/renderer/indexed_db/renderer_webidbcursor_impl.h
index fb161e6..aa386bb 100644
--- a/content/renderer/renderer_webidbcursor_impl.h
+++ b/content/renderer/indexed_db/renderer_webidbcursor_impl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
 
 #include <deque>
 
 #include "base/basictypes.h"
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 #include "content/public/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
@@ -72,4 +72,4 @@ class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
   enum { kMaxPrefetchAmount = 100 };
 };
 
-#endif  // CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBCURSOR_IMPL_H_
diff --git a/content/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/indexed_db/renderer_webidbdatabase_impl.cc
index 90eea27..6a07cc0 100644
--- a/content/renderer/renderer_webidbdatabase_impl.cc
+++ b/content/renderer/indexed_db/renderer_webidbdatabase_impl.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_webidbdatabase_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbdatabase_impl.h"
 
-#include "content/common/indexed_db_messages.h"
-#include "content/renderer/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_webidbobjectstore_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/renderer_webidbobjectstore_impl.h"
-#include "content/renderer/renderer_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/renderer_webidbdatabase_impl.h b/content/renderer/indexed_db/renderer_webidbdatabase_impl.h
index 95d47a0..1f9b080 100644
--- a/content/renderer/renderer_webidbdatabase_impl.h
+++ b/content/renderer/indexed_db/renderer_webidbdatabase_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_RENDERER_WEBIDBDATABASE_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBDATABASE_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_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_RENDERER_WEBIDBDATABASE_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBDATABASE_IMPL_H_
diff --git a/content/renderer/renderer_webidbfactory_impl.cc b/content/renderer/indexed_db/renderer_webidbfactory_impl.cc
index bd13b6c..166d92c 100644
--- a/content/renderer/renderer_webidbfactory_impl.cc
+++ b/content/renderer/indexed_db/renderer_webidbfactory_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_webidbfactory_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbfactory_impl.h"
 
+#include "content/renderer/indexed_db/indexed_db_dispatcher.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/indexed_db_dispatcher.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/renderer_webidbfactory_impl.h b/content/renderer/indexed_db/renderer_webidbfactory_impl.h
index 9b084fa..87fcdfe7 100644
--- a/content/renderer/renderer_webidbfactory_impl.h
+++ b/content/renderer/indexed_db/renderer_webidbfactory_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_RENDERER_WEBIDBFACTORY_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBFACTORY_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_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_RENDERER_WEBIDBFACTORY_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBFACTORY_IMPL_H_
diff --git a/content/renderer/renderer_webidbindex_impl.cc b/content/renderer/indexed_db/renderer_webidbindex_impl.cc
index 78e41a5..37e96f1 100644
--- a/content/renderer/renderer_webidbindex_impl.cc
+++ b/content/renderer/indexed_db/renderer_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/renderer_webidbindex_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbindex_impl.h"
 
-#include "content/common/indexed_db_messages.h"
-#include "content/renderer/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/renderer/renderer_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"
 
diff --git a/content/renderer/renderer_webidbindex_impl.h b/content/renderer/indexed_db/renderer_webidbindex_impl.h
index 8ad8456..01fc051 100644
--- a/content/renderer/renderer_webidbindex_impl.h
+++ b/content/renderer/indexed_db/renderer_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_RENDERER_WEBIDBINDEX_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -48,4 +48,4 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex {
   int32 idb_index_id_;
 };
 
-#endif  // CONTENT_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBINDEX_IMPL_H_
diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/indexed_db/renderer_webidbobjectstore_impl.cc
index 0bb78dd..9e1a002 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/indexed_db/renderer_webidbobjectstore_impl.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/renderer_webidbobjectstore_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbobjectstore_impl.h"
 
-#include "content/common/indexed_db_messages.h"
+#include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/public/common/serialized_script_value.h"
-#include "content/renderer/indexed_db_dispatcher.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/renderer/renderer_webidbindex_impl.h"
-#include "content/renderer/renderer_webidbtransaction_impl.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/renderer_webidbobjectstore_impl.h b/content/renderer/indexed_db/renderer_webidbobjectstore_impl.h
index 203bfdd..18c4589 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.h
+++ b/content/renderer/indexed_db/renderer_webidbobjectstore_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_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_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_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
diff --git a/content/renderer/renderer_webidbtransaction_impl.cc b/content/renderer/indexed_db/renderer_webidbtransaction_impl.cc
index a7d2814..f3db376 100644
--- a/content/renderer/renderer_webidbtransaction_impl.cc
+++ b/content/renderer/indexed_db/renderer_webidbtransaction_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/renderer_webidbtransaction_impl.h"
+#include "content/renderer/indexed_db/renderer_webidbtransaction_impl.h"
 
-#include "content/common/indexed_db_messages.h"
-#include "content/renderer/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_webidbobjectstore_impl.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/renderer_webidbobjectstore_impl.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/renderer_webidbtransaction_impl.h b/content/renderer/indexed_db/renderer_webidbtransaction_impl.h
index c7390ee..164cdad 100644
--- a/content/renderer/renderer_webidbtransaction_impl.h
+++ b/content/renderer/indexed_db/renderer_webidbtransaction_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
-#define CONTENT_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#ifndef CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#define CONTENT_RENDERER_INDEXED_DB_RENDERER_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_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#endif  // CONTENT_RENDERER_INDEXED_DB_RENDERER_WEBIDBTRANSACTION_IMPL_H_
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 2637bc05..4ce87a4 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -42,8 +42,9 @@
 #include "content/renderer/devtools_agent_filter.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
-#include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/indexed_db_message_filter.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"
@@ -51,7 +52,6 @@
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_view_impl.h"
-#include "content/renderer/renderer_webidbfactory_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index d687adc..1e8b0bc 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -22,12 +22,12 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.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/render_thread_impl.h"
 #include "content/renderer/renderer_clipboard_client.h"
 #include "content/renderer/renderer_webaudiodevice_impl.h"
-#include "content/renderer/renderer_webidbfactory_impl.h"
 #include "content/renderer/renderer_webstoragenamespace_impl.h"
 #include "content/renderer/websharedworkerrepository_impl.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index a908775..ccd3f7d 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_vector.h"
 #include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/utility_messages.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/utility/content_utility_client.h"
@@ -161,4 +161,3 @@ void UtilityThreadImpl::OnLoadPlugins(
   ReleaseProcessIfNeeded();
 }
 #endif
-