diff options
author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
tree | 29f309f9534e05c47244eedb438fc612578d133b /chrome/browser/media_uitest.cc | |
parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'chrome/browser/media_uitest.cc')
-rw-r--r-- | chrome/browser/media_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc index 61861e0..0d1bc26 100644 --- a/chrome/browser/media_uitest.cc +++ b/chrome/browser/media_uitest.cc @@ -5,8 +5,8 @@ #include "app/gfx/gl/gl_implementation.h" #include "base/basictypes.h" #include "base/file_path.h" -#include "base/platform_thread.h" #include "base/string_util.h" +#include "base/threading/platform_thread.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/ui/ui_layout_test.h" @@ -46,7 +46,7 @@ class MediaTest : public UITest { const std::wstring kFailed = L"FAILED"; const std::wstring kError = L"ERROR"; for (int i = 0; i < 10; ++i) { - PlatformThread::Sleep(sleep_timeout_ms()); + base::PlatformThread::Sleep(sleep_timeout_ms()); const std::wstring& title = GetActiveTabTitle(); if (title == kPlaying || title == kFailed || StartsWith(title, kError, true)) @@ -65,7 +65,7 @@ class MediaTest : public UITest { } }; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_WIN) // Test appears to be fine on linux, but let's first change to flaky and // see how that goes. // http://crbug.com/56364 |