webkit: move SimpleDatabaseSystem into webkit/support/

It is used by DRT and by test_shell, so it belongs in webkit/support/.

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

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

8 files changed, 12 insertions, 12 deletions

diff --git a/webkit/tools/test_shell/simple_database_system.cc b/webkit/support/simple_database_system.cc
index d9f0cbc..c1749a5 100644
--- a/webkit/tools/test_shell/simple_database_system.cc
+++ b/webkit/support/simple_database_system.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 "webkit/tools/test_shell/simple_database_system.h"
+#include "webkit/support/simple_database_system.h"
 
 #include "base/auto_reset.h"
 #include "base/file_util.h"
diff --git a/webkit/tools/test_shell/simple_database_system.h b/webkit/support/simple_database_system.h
index 7efe072..682c123 100644
--- a/webkit/tools/test_shell/simple_database_system.h
+++ b/webkit/support/simple_database_system.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 WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_
-#define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_
+#ifndef WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_
+#define WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_
 
 #include "base/file_path.h"
 #include "base/hash_tables.h"
@@ -81,4 +81,4 @@ class SimpleDatabaseSystem : public webkit_database::DatabaseTracker::Observer,
   webkit_database::DatabaseConnections database_connections_;
 };
 
-#endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_DATABASE_SYSTEM_H_
+#endif  // WEBKIT_SUPPORT_SIMPLE_DATABASE_SYSTEM_H_
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 73c8a41..7b90dea 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -40,10 +40,10 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitclient_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
+#include "webkit/support/simple_database_system.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
 #include "webkit/tools/test_shell/mock_webclipboard_impl.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
diff --git a/webkit/support/test_webkit_client.h b/webkit/support/test_webkit_client.h
index efeecf6..8867864 100644
--- a/webkit/support/test_webkit_client.h
+++ b/webkit/support/test_webkit_client.h
@@ -7,10 +7,10 @@
 
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/glue/webkitclient_impl.h"
+#include "webkit/support/simple_database_system.h"
 #include "webkit/support/weburl_loader_mock_factory.h"
 #include "webkit/tools/test_shell/mock_webclipboard_impl.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_webcookiejar_impl.h"
 #include "webkit/tools/test_shell/test_shell_webmimeregistry_impl.h"
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 83fae0c..89c39cc 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -47,9 +47,9 @@
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/npapi/webplugininfo.h"
 #include "webkit/support/platform_support.h"
+#include "webkit/support/simple_database_system.h"
 #include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/test_webkit_client.h"
-#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 5b682c0..b62b4bb 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -83,13 +83,11 @@
         '<(DEPTH)/webkit/tools/test_shell/mock_webclipboard_impl.h',
         '<(DEPTH)/webkit/tools/test_shell/simple_appcache_system.cc',
         '<(DEPTH)/webkit/tools/test_shell/simple_appcache_system.h',
+        '<(DEPTH)/webkit/tools/test_shell/simple_clipboard_impl.cc',
         '<(DEPTH)/webkit/tools/test_shell/simple_file_system.cc',
         '<(DEPTH)/webkit/tools/test_shell/simple_file_system.h',
         '<(DEPTH)/webkit/tools/test_shell/simple_file_writer.cc',
         '<(DEPTH)/webkit/tools/test_shell/simple_file_writer.h',
-        '<(DEPTH)/webkit/tools/test_shell/simple_clipboard_impl.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_database_system.cc',
-        '<(DEPTH)/webkit/tools/test_shell/simple_database_system.h',
         '<(DEPTH)/webkit/tools/test_shell/simple_resource_loader_bridge.cc',
         '<(DEPTH)/webkit/tools/test_shell/simple_resource_loader_bridge.h',
         '<(DEPTH)/webkit/tools/test_shell/simple_socket_stream_bridge.cc',
@@ -102,6 +100,8 @@
         '<(DEPTH)/webkit/tools/test_shell/test_shell_webblobregistry_impl.h',
         '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.cc',
         '<(DEPTH)/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h',
+        'simple_database_system.cc',
+        'simple_database_system.h',
       ],
       'conditions': [
         ['inside_chromium_build==0', {
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index a5da7b2..5a32064 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -38,8 +38,8 @@
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/support/simple_database_system.h"
 #include "webkit/tools/test_shell/notification_presenter.h"
-#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index f4c1e79..0b400cb 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -16,9 +16,9 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitclient_impl.h"
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
+#include "webkit/support/simple_database_system.h"
 #include "webkit/tools/test_shell/mock_webclipboard_impl.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
-#include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/simple_webcookiejar_impl.h"