Move more files from chrome/test to chrome/test/base, part #4

BUG=90905
Review URL: http://codereview.chromium.org/7544021

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

14 files changed, 22 insertions, 22 deletions

diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 91779c0..8f0f9a4 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -19,8 +19,8 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/automation_proxy.h"
+#include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/base/test_launcher_utils.h"
-#include "chrome/test/chrome_process_util.h"
 #include "chrome/test/test_switches.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/child_process_info.h"
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 9cdbd40..1bdc229 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.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/browser_with_test_window_test.h"
+#include "chrome/test/base/browser_with_test_window_test.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
@@ -12,7 +12,7 @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/test/testing_profile.h"
+#include "chrome/test/base/testing_profile.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h
index 0d0efb0..4421dfa 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/base/browser_with_test_window_test.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
-#define CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
+#ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
+#define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/test_browser_window.h"
+#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/testing_browser_process_test.h"
-#include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -110,4 +110,4 @@ class BrowserWithTestWindowTest : public TestingBrowserProcessTest {
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };
 
-#endif  // CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
+#endif  // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
diff --git a/chrome/test/chrome_process_util.cc b/chrome/test/base/chrome_process_util.cc
index e09351f..e0cb839 100644
--- a/chrome/test/chrome_process_util.cc
+++ b/chrome/test/base/chrome_process_util.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/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 
 #include <vector>
 #include <set>
diff --git a/chrome/test/chrome_process_util.h b/chrome/test/base/chrome_process_util.h
index aabcb91..df82abd 100644
--- a/chrome/test/chrome_process_util.h
+++ b/chrome/test/base/chrome_process_util.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 CHROME_TEST_CHROME_PROCESS_UTIL_H_
-#define CHROME_TEST_CHROME_PROCESS_UTIL_H_
+#ifndef CHROME_TEST_BASE_CHROME_PROCESS_UTIL_H_
+#define CHROME_TEST_BASE_CHROME_PROCESS_UTIL_H_
 #pragma once
 
 #include <vector>
@@ -93,4 +93,4 @@ MacChromeProcessInfoList GetRunningMacProcessInfo(
 
 #endif  // defined(OS_MACOSX)
 
-#endif  // CHROME_TEST_CHROME_PROCESS_UTIL_H_
+#endif  // CHROME_TEST_BASE_CHROME_PROCESS_UTIL_H_
diff --git a/chrome/test/chrome_process_util_mac.cc b/chrome/test/base/chrome_process_util_mac.cc
index 1233250..e935ad5 100644
--- a/chrome/test/chrome_process_util_mac.cc
+++ b/chrome/test/base/chrome_process_util_mac.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/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/test/chrome_process_util_uitest.cc b/chrome/test/base/chrome_process_util_uitest.cc
index c24956d..182eaa1 100644
--- a/chrome/test/chrome_process_util_uitest.cc
+++ b/chrome/test/base/chrome_process_util_uitest.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/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 
 #include "chrome/test/ui/ui_test.h"
 
diff --git a/chrome/test/base/profile_mock.h b/chrome/test/base/profile_mock.h
index 967a3ab..f557a88 100644
--- a/chrome/test/base/profile_mock.h
+++ b/chrome/test/base/profile_mock.h
@@ -6,7 +6,7 @@
 #define CHROME_TEST_BASE_PROFILE_MOCK_H_
 #pragma once
 
-#include "chrome/test/testing_profile.h"
+#include "chrome/test/base/testing_profile.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/chrome/test/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 717f236..3925b31 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/base/testing_profile.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_profile.h"
+#include "chrome/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
diff --git a/chrome/test/testing_profile.h b/chrome/test/base/testing_profile.h
index 47e6d5e..5aef690 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/base/testing_profile.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 CHROME_TEST_TESTING_PROFILE_H_
-#define CHROME_TEST_TESTING_PROFILE_H_
+#ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
+#define CHROME_TEST_BASE_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -396,4 +396,4 @@ class TestingProfile : public Profile {
   scoped_refptr<quota::QuotaManager> quota_manager_;
 };
 
-#endif  // CHROME_TEST_TESTING_PROFILE_H_
+#endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index ee9c6f0..4f18d50 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -18,7 +18,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-#include "chrome/test/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 393f13c..8791381 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -18,7 +18,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-#include "chrome/test/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/test_switches.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/test/ui/ui_perf_test.cc b/chrome/test/ui/ui_perf_test.cc
index 2d0c246..360c7b3 100644
--- a/chrome/test/ui/ui_perf_test.cc
+++ b/chrome/test/ui/ui_perf_test.cc
@@ -8,7 +8,7 @@
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/test_switches.h"
 
 void UIPerfTest::SetLaunchSwitches() {
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index d8aae79..6a11896 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -43,7 +43,7 @@
 #include "chrome/test/automation/proxy_launcher.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
-#include "chrome/test/chrome_process_util.h"
+#include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/test_switches.h"
 #include "content/common/debug_flags.h"
 #include "content/common/json_value_serializer.h"