summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:09:45 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:09:45 +0000
commitbb5c95c9bff8920f56d1737b27e2eb1ae99c54ad (patch)
tree08bf4704252fdfc8fcb286a208c691d7d3045c33 /chrome_frame
parentab612c5e4139b7ab5be53f063efc1739bc452137 (diff)
downloadchromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.zip
chromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.tar.gz
chromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.tar.bz2
Move perftimer.* into base/test/ directory.
This should address the TODO from tools/gn/secondary/base/BUILD.gn BUG=None TEST=test_support_perf R=brettw@chromium.org TBR=cpu, dalecurtis, akalin, thestig Review URL: https://chromiumcodereview.appspot.com/22887041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp2
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index f9d13a5..06648be 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -350,7 +350,7 @@
],
'sources': [
'../base/test/perf_test_suite.h',
- '../base/perftimer.cc',
+ '../base/test/perftimer.cc',
'../base/test/test_file_util.h',
'../chrome/test/base/chrome_process_util.cc',
'../chrome/test/base/chrome_process_util.h',
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.h b/chrome_frame/test/perf/chrome_frame_perftest.h
index 370ae5c..8209846 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.h
+++ b/chrome_frame/test/perf/chrome_frame_perftest.h
@@ -4,7 +4,7 @@
#ifndef CHROME_FRAME_TEST_PERF_CHROME_FRAME_PERFTEST_H_
#define CHROME_FRAME_TEST_PERF_CHROME_FRAME_PERFTEST_H_
#include <atlbase.h>
-#include "base/perftimer.h"
+#include "base/test/perftimer.h"
#include "testing/gtest/include/gtest/gtest.h"
class SimpleModule : public CAtlExeModuleT<SimpleModule> {