summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 00:59:16 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 00:59:16 +0000
commitf3ec774a2c177d3c6845553d3bf9735a7b8a5907 (patch)
treeed09ccf69300383bd4b2e8ac7c8b9d1bdeead07b /chrome/test
parentbb515eda39129537a089a062c3db3152e63f24d9 (diff)
downloadchromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.zip
chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.gz
chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.bz2
Move a bunch of TabContents related files into a tab_contents subdir
Review URL: http://codereview.chromium.org/18250 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automation/tab_proxy.h2
-rw-r--r--chrome/test/test_tab_contents.cc2
-rw-r--r--chrome/test/test_tab_contents.h4
-rw-r--r--chrome/test/ui/ui_tests.vcproj2
-rw-r--r--chrome/test/unit/unittests.vcproj14
5 files changed, 12 insertions, 12 deletions
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index eec9119..64e04de 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -11,7 +11,7 @@
#include "chrome/browser/download/save_package.h"
#include "chrome/browser/security_style.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/test/automation/automation_handle_tracker.h"
class ConstrainedWindowProxy;
diff --git a/chrome/test/test_tab_contents.cc b/chrome/test/test_tab_contents.cc
index 0cb8f54..768b9e7 100644
--- a/chrome/test/test_tab_contents.cc
+++ b/chrome/test/test_tab_contents.cc
@@ -4,7 +4,7 @@
#include "chrome/test/test_tab_contents.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
// static
SiteInstance* TestTabContents::site_instance_ = NULL;
diff --git a/chrome/test/test_tab_contents.h b/chrome/test/test_tab_contents.h
index e8b56d4..d2aa48f 100644
--- a/chrome/test/test_tab_contents.h
+++ b/chrome/test/test_tab_contents.h
@@ -6,8 +6,8 @@
#define CHROME_BROWSER_TEST_TEST_TAB_CONTENTS_H_
#include "base/string_util.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
// TabContents typed created by TestTabContentsFactory.
class TestTabContents : public TabContents {
diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj
index 9d5bdb1..83e351c 100644
--- a/chrome/test/ui/ui_tests.vcproj
+++ b/chrome/test/ui/ui_tests.vcproj
@@ -346,7 +346,7 @@
Name="TestViewSource"
>
<File
- RelativePath="..\..\browser\view_source_uitest.cc"
+ RelativePath="..\..\browser\tab_contents\view_source_uitest.cc"
>
</File>
</Filter>
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 4a0194f..c9aa55c 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -154,11 +154,11 @@
>
</File>
<File
- RelativePath="..\browser_with_test_window_test.h"
+ RelativePath="..\browser_with_test_window_test.cc"
>
</File>
<File
- RelativePath="..\browser_with_test_window_test.cc"
+ RelativePath="..\browser_with_test_window_test.h"
>
</File>
<File
@@ -779,7 +779,7 @@
>
</File>
<File
- RelativePath="..\..\browser\web_contents_unittest.cc"
+ RelativePath="..\..\browser\tab_contents\web_contents_unittest.cc"
>
</File>
<File
@@ -798,10 +798,10 @@
RelativePath="..\..\browser\window_sizer_unittest.cc"
>
</File>
- <File
- RelativePath="..\..\common\worker_thread_ticker_unittest.cc"
- >
- </File>
+ <File
+ RelativePath="..\..\common\worker_thread_ticker_unittest.cc"
+ >
+ </File>
</Files>
<Globals>
</Globals>