diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:02:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:02:16 +0000 |
| commit | ce072a7181ea5d58133e33654133236f5d9f5551 (patch) | |
| tree | 1b1c903fec3fd27038cd17cb4ae9ca17d3736e40 /chrome_frame/test/perf | |
| parent | a8e2058011129cbef38bf89834ee01715556b392 (diff) | |
| download | chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.zip chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.gz chromium_src-ce072a7181ea5d58133e33654133236f5d9f5551.tar.bz2 | |
Move platform_thread to base/threading and put in the base namespace. I left a
stub and "using" declarations in the old location to avoid having to change the
entire project at once.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6001010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/perf')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 67220aa..f589146 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -11,6 +11,7 @@ #include "chrome_tab.h" // Generated from chrome_tab.idl. +#include "base/debug/trace_event_win.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" @@ -18,11 +19,11 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/threading/platform_thread.h" #include "base/time.h" -#include "base/debug/trace_event_win.h" #include "base/utf_string_conversions.h" -#include "base/win/event_trace_controller.h" #include "base/win/event_trace_consumer.h" +#include "base/win/event_trace_controller.h" #include "base/win/registry.h" #include "base/win/scoped_bstr.h" #include "base/win/scoped_comptr.h" @@ -32,7 +33,6 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/test/chrome_process_util.h" #include "chrome/test/ui/ui_perf_test.h" - #include "chrome_frame/test_utils.h" #include "chrome_frame/utils.h" @@ -343,7 +343,7 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase { // TODO(beng): Can't shut down so quickly. Figure out why, and fix. If we // do, we crash. - PlatformThread::Sleep(50); + base::PlatformThread::Sleep(50); } std::string times; @@ -810,7 +810,7 @@ class ChromeFrameActiveXMemoryTest : public MemoryTestBase { PrintResults(test_name_.c_str()); CoFreeUnusedLibraries(); - PlatformThread::Sleep(100); + base::PlatformThread::Sleep(100); } void NavigateImpl(const std::string& url) { |