diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 6 | ||||
| -rw-r--r-- | base/test/perf_test_suite.cc | 2 | ||||
| -rw-r--r-- | base/test/perftimer.cc (renamed from base/perftimer.cc) | 4 | ||||
| -rw-r--r-- | base/test/perftimer.h (renamed from base/perftimer.h) | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/base/base.gyp b/base/base.gyp index 39e9f33..fabc868 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -865,7 +865,6 @@ }], ], 'sources': [ - 'perftimer.cc', 'test/expectations/expectation.cc', 'test/expectations/expectation.h', 'test/expectations/parser.cc', @@ -885,6 +884,7 @@ 'test/null_task_runner.h', 'test/perf_test_suite.cc', 'test/perf_test_suite.h', + 'test/perftimer.cc', 'test/power_monitor_test_base.cc', 'test/power_monitor_test_base.h', 'test/scoped_locale.cc', @@ -935,9 +935,9 @@ 'test/thread_test_helper.h', 'test/trace_event_analyzer.cc', 'test/trace_event_analyzer.h', - 'test/unit_test_launcher_ios.cc', 'test/unit_test_launcher.cc', 'test/unit_test_launcher.h', + 'test/unit_test_launcher_ios.cc', 'test/values_test_util.cc', 'test/values_test_util.h', ], @@ -963,7 +963,7 @@ '../testing/gtest.gyp:gtest', ], 'sources': [ - 'perftimer.cc', + 'test/perftimer.cc', 'test/run_all_perftests.cc', ], 'direct_dependent_settings': { diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc index 8cfbb73..86be119 100644 --- a/base/test/perf_test_suite.cc +++ b/base/test/perf_test_suite.cc @@ -8,9 +8,9 @@ #include "base/debug/debugger.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/perftimer.h" #include "base/process/launch.h" #include "base/strings/string_util.h" +#include "base/test/perftimer.h" #include "testing/gtest/include/gtest/gtest.h" namespace base { diff --git a/base/perftimer.cc b/base/test/perftimer.cc index 9ab7c6b..6815f0b 100644 --- a/base/perftimer.cc +++ b/base/test/perftimer.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/perftimer.h" +#include "base/test/perftimer.h" #include <stdio.h> #include <string> diff --git a/base/perftimer.h b/base/test/perftimer.h index 466f81d..1a26cf5 100644 --- a/base/perftimer.h +++ b/base/test/perftimer.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PERFTIMER_H_ -#define BASE_PERFTIMER_H_ +#ifndef BASE_TEST_PERFTIMER_H_ +#define BASE_TEST_PERFTIMER_H_ #include <string> @@ -82,4 +82,4 @@ class PerfTimeLogger { PerfTimer timer_; }; -#endif // BASE_PERFTIMER_H_ +#endif // BASE_TEST_PERFTIMER_H_ |