Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Side by Side Diff: chrome/test/page_cycler/page_cycler_test.cc

Issue 6188004: Remove test_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/bookmarks_ui_uitest.cc ('k') | chrome/test/selenium/selenium_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "base/test/test_timeouts.h"
13 #include "base/utf_string_conversions.h" 14 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/net/url_fixer_upper.h" 15 #include "chrome/browser/net/url_fixer_upper.h"
15 #include "chrome/common/chrome_constants.h" 16 #include "chrome/common/chrome_constants.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
18 #include "chrome/test/automation/tab_proxy.h" 19 #include "chrome/test/automation/tab_proxy.h"
19 #include "chrome/test/automation/window_proxy.h" 20 #include "chrome/test/automation/window_proxy.h"
20 #include "chrome/test/chrome_process_util.h" 21 #include "chrome/test/chrome_process_util.h"
21 #include "chrome/test/test_switches.h" 22 #include "chrome/test/test_switches.h"
22 #include "chrome/test/ui/ui_perf_test.h" 23 #include "chrome/test/ui/ui_perf_test.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 replacements.SetQuery( 233 replacements.SetQuery(
233 query_string.c_str(), 234 query_string.c_str(),
234 url_parse::Component(0, query_string.length())); 235 url_parse::Component(0, query_string.length()));
235 test_url = test_url.ReplaceComponents(replacements); 236 test_url = test_url.ReplaceComponents(replacements);
236 237
237 scoped_refptr<TabProxy> tab(GetActiveTab()); 238 scoped_refptr<TabProxy> tab(GetActiveTab());
238 ASSERT_TRUE(tab.get()); 239 ASSERT_TRUE(tab.get());
239 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url)); 240 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
240 241
241 // Wait for the test to finish. 242 // Wait for the test to finish.
242 ASSERT_TRUE(WaitUntilCookieValue(tab.get(), test_url, "__pc_done", 243 ASSERT_TRUE(WaitUntilCookieValue(
243 UITest::test_timeout_ms(), "1")); 244 tab.get(), test_url, "__pc_done",
245 TestTimeouts::huge_test_timeout_ms(), "1"));
244 246
245 std::string cookie; 247 std::string cookie;
246 ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie)); 248 ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie));
247 pages->assign(UTF8ToWide(cookie)); 249 pages->assign(UTF8ToWide(cookie));
248 ASSERT_FALSE(pages->empty()); 250 ASSERT_FALSE(pages->empty());
249 251
250 // Get the timing cookie value from the DOM automation. 252 // Get the timing cookie value from the DOM automation.
251 std::wstring wcookie; 253 std::wstring wcookie;
252 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", 254 ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
253 L"window.domAutomationController.send(" 255 L"window.domAutomationController.send("
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 #endif 591 #endif
590 592
591 // Indexed DB tests. 593 // Indexed DB tests.
592 // Disabled in debug builds on Windows. 594 // Disabled in debug builds on Windows.
593 // Bug http://code.google.com/p/chromium/issues/detail?id=67918 595 // Bug http://code.google.com/p/chromium/issues/detail?id=67918
594 #if !defined(OS_WIN) || defined(NDEBUG) 596 #if !defined(OS_WIN) || defined(NDEBUG)
595 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert); 597 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
596 #endif 598 #endif
597 599
598 } // namespace 600 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/bookmarks_ui_uitest.cc ('k') | chrome/test/selenium/selenium_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698