| Index: chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc
|
| ===================================================================
|
| --- chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc (revision 70328)
|
| +++ chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc (working copy)
|
| @@ -1,7 +1,8 @@
|
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 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/threading/platform_thread.h"
|
| #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
|
| #include "chrome/test/automation/browser_proxy.h"
|
| #include "chrome/test/automation/tab_proxy.h"
|
| @@ -11,7 +12,7 @@
|
| NewTab();
|
| NewTab();
|
| ASSERT_TRUE(active_browser()->WaitForTabCountToBecome(3));
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
| ASSERT_TRUE(DragTabOut());
|
| int window_count;
|
| ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
|
| @@ -24,7 +25,7 @@
|
| ASSERT_TRUE(active_browser()->WaitForTabCountToBecome(3));
|
| // TODO(phajdan.jr): We need a WaitForTabstripAnimationsToEnd() function.
|
| // Every sleep in this file should be replaced with it.
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
|
|
| scoped_refptr<TabProxy> dragged_tab(active_browser()->GetActiveTab());
|
| int tab_index;
|
| @@ -34,13 +35,13 @@
|
| // Drag the active tab to left. Now it should be the middle tab.
|
| ASSERT_TRUE(DragActiveTab(false));
|
| // We wait for the animation to be over.
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
| ASSERT_TRUE(dragged_tab->GetTabIndex(&tab_index));
|
| EXPECT_EQ(1, tab_index);
|
|
|
| // Drag the active tab to left. Now it should be the leftmost tab.
|
| ASSERT_TRUE(DragActiveTab(false));
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
| ASSERT_TRUE(dragged_tab->GetTabIndex(&tab_index));
|
| EXPECT_EQ(0, tab_index);
|
|
|
| @@ -50,13 +51,13 @@
|
|
|
| // Drag the active tab to right. Now it should be the middle tab.
|
| ASSERT_TRUE(DragActiveTab(true));
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
| ASSERT_TRUE(dragged_tab->GetTabIndex(&tab_index));
|
| EXPECT_EQ(1, tab_index);
|
|
|
| // Drag the active tab to right. Now it should be the rightmost tab.
|
| ASSERT_TRUE(DragActiveTab(true));
|
| - PlatformThread::Sleep(sleep_timeout_ms());
|
| + base::PlatformThread::Sleep(sleep_timeout_ms());
|
| ASSERT_TRUE(dragged_tab->GetTabIndex(&tab_index));
|
| EXPECT_EQ(2, tab_index);
|
|
|
|
|