summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 21:01:15 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 21:01:15 +0000
commitbf9257746c047fb6cb8baa3d75dbf5b8fa9d021e (patch)
tree65489616351a7055ff86d25a6875b06b6fcf4980 /content
parente878919bb91f1c4f1c3bd1629f8b9cdd7c7b9dfb (diff)
downloadchromium_src-bf9257746c047fb6cb8baa3d75dbf5b8fa9d021e.zip
chromium_src-bf9257746c047fb6cb8baa3d75dbf5b8fa9d021e.tar.gz
chromium_src-bf9257746c047fb6cb8baa3d75dbf5b8fa9d021e.tar.bz2
Reorganize chrome/test, part #9
TBR=jcivelli BUG=90905 Review URL: http://codereview.chromium.org/7616019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/appcache/chrome_appcache_service_unittest.cc4
-rw-r--r--content/browser/browser_url_handler_unittest.cc2
-rw-r--r--content/browser/download/mhtml_generation_browsertest.cc2
-rw-r--r--content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc2
-rw-r--r--content/browser/in_process_webkit/webkit_context_unittest.cc2
-rw-r--r--content/browser/plugin_service_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_unittest.cc2
-rw-r--r--content/browser/renderer_host/test_render_view_host.h2
-rw-r--r--content/browser/site_instance_unittest.cc2
-rw-r--r--content/browser/tab_contents/navigation_entry_unittest.cc2
-rw-r--r--content/browser/tab_contents/tab_contents_delegate_unittest.cc2
-rw-r--r--content/common/notification_service_unittest.cc2
12 files changed, 13 insertions, 13 deletions
diff --git a/content/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index cabbd05..852afe8 100644
--- a/content/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -6,8 +6,8 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop.h"
#include "base/scoped_temp_dir.h"
-#include "chrome/test/testing_browser_process.h"
-#include "chrome/test/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/appcache/chrome_appcache_service.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/browser_url_handler_unittest.cc b/content/browser/browser_url_handler_unittest.cc
index 2dde02f..f6af8ec 100644
--- a/content/browser/browser_url_handler_unittest.cc
+++ b/content/browser/browser_url_handler_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process_test.h"
#include "content/browser/browser_url_handler.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc
index 3d8acf9..b0589a8 100644
--- a/content/browser/download/mhtml_generation_browsertest.cc
+++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -6,8 +6,8 @@
#include "base/scoped_temp_dir.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "chrome/test/testing_browser_process.h"
#include "content/browser/download/mhtml_generation_manager.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/content_notification_types.h"
diff --git a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
index 3f99a2b..6020263 100644
--- a/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
+++ b/content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc
@@ -9,8 +9,8 @@
#include "base/memory/scoped_callback_factory.h"
#include "base/message_loop.h"
#include "base/message_loop_proxy.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process_test.h"
#include "content/browser/in_process_webkit/indexed_db_context.h"
#include "content/browser/in_process_webkit/indexed_db_quota_client.h"
#include "content/browser/in_process_webkit/webkit_context.h"
diff --git a/content/browser/in_process_webkit/webkit_context_unittest.cc b/content/browser/in_process_webkit/webkit_context_unittest.cc
index b1ff007..6ad6f6e 100644
--- a/content/browser/in_process_webkit/webkit_context_unittest.cc
+++ b/content/browser/in_process_webkit/webkit_context_unittest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process.h"
#include "content/browser/browser_thread.h"
#include "content/browser/in_process_webkit/dom_storage_context.h"
#include "content/browser/in_process_webkit/webkit_context.h"
diff --git a/content/browser/plugin_service_unittest.cc b/content/browser/plugin_service_unittest.cc
index d5c61ce..4e254db 100644
--- a/content/browser/plugin_service_unittest.cc
+++ b/content/browser/plugin_service_unittest.cc
@@ -4,7 +4,7 @@
#include "content/browser/plugin_service.h"
-#include "chrome/test/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 7b28735e..f77b56a 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -7,8 +7,8 @@
#include "base/shared_memory.h"
#include "base/timer.h"
#include "build/build_config.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/backing_store.h"
#include "content/browser/renderer_host/test_render_view_host.h"
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index 8316d73..1c58db9 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -15,7 +15,7 @@
#include "content/browser/renderer_host/render_view_host_factory.h"
#include "content/browser/renderer_host/render_widget_host_view.h"
#include "content/common/page_transition_types.h"
-#include "chrome/test/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace gfx {
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index 8d97834..6049eb7 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -5,8 +5,8 @@
#include "base/compiler_specific.h"
#include "base/stl_util.h"
#include "base/string16.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process_test.h"
#include "content/browser/browser_thread.h"
#include "content/browser/browsing_instance.h"
#include "content/browser/child_process_security_policy.h"
diff --git a/content/browser/tab_contents/navigation_entry_unittest.cc b/content/browser/tab_contents/navigation_entry_unittest.cc
index 15931cd..f67696f 100644
--- a/content/browser/tab_contents/navigation_entry_unittest.cc
+++ b/content/browser/tab_contents/navigation_entry_unittest.cc
@@ -5,7 +5,7 @@
#include "base/string16.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
-#include "chrome/test/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/navigation_entry.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/tab_contents/tab_contents_delegate_unittest.cc b/content/browser/tab_contents/tab_contents_delegate_unittest.cc
index 1c1668d..b23929a 100644
--- a/content/browser/tab_contents/tab_contents_delegate_unittest.cc
+++ b/content/browser/tab_contents/tab_contents_delegate_unittest.cc
@@ -6,7 +6,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/testing_browser_process.h"
+#include "chrome/test/base/testing_browser_process.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/common/notification_service_unittest.cc b/content/common/notification_service_unittest.cc
index 7cdcb6d..a8751c8 100644
--- a/content/common/notification_service_unittest.cc
+++ b/content/common/notification_service_unittest.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 "chrome/test/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process_test.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
#include "content/common/notification_service.h"