summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-01 19:58:16 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-01 19:58:16 +0000
commita4ff9eaea74e058144eda4164fe4694e6e1b9c21 (patch)
tree5d95aad3baf47436a8e0075c273274929f762eb8 /chrome_frame
parent7ae28e23dba30062ab6b97e31e611fb2b55e62df (diff)
downloadchromium_src-a4ff9eaea74e058144eda4164fe4694e6e1b9c21.zip
chromium_src-a4ff9eaea74e058144eda4164fe4694e6e1b9c21.tar.gz
chromium_src-a4ff9eaea74e058144eda4164fe4694e6e1b9c21.tar.bz2
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
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp8
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.cc2
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 1e39ceb..50a7c08 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -316,8 +316,8 @@
'../base/test/perf_test_suite.h',
'../base/perftimer.cc',
'../base/test/test_file_util.h',
- '../chrome/test/chrome_process_util.cc',
- '../chrome/test/chrome_process_util.h',
+ '../chrome/test/base/chrome_process_util.cc',
+ '../chrome/test/base/chrome_process_util.h',
'../chrome/test/ui/ui_test.cc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
'test/chrome_frame_test_utils.cc',
@@ -483,12 +483,12 @@
'../base/test/test_file_util_win.cc',
'../chrome/test/automation/proxy_launcher.cc',
'../chrome/test/automation/proxy_launcher.h',
+ '../chrome/test/base/chrome_process_util.cc',
+ '../chrome/test/base/chrome_process_util.h',
'../chrome/test/ui/ui_test.cc',
'../chrome/test/ui/ui_test.h',
'../chrome/test/ui/ui_test_suite.cc',
'../chrome/test/ui/ui_test_suite.h',
- '../chrome/test/chrome_process_util.cc',
- '../chrome/test/chrome_process_util.h',
],
'resource_include_dirs': [
'<(INTERMEDIATE_DIR)',
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index a46b012..2faf2e8 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -31,7 +31,7 @@
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.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 "chrome_frame/test_utils.h"
#include "chrome_frame/utils.h"