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

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

Issue 7744031: Remove obsolete test timeouts and convert callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/perf/sunspider_uitest.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) 2011 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"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 url_parse::Component(0, query_string.length())); 183 url_parse::Component(0, query_string.length()));
184 test_url = test_url.ReplaceComponents(replacements); 184 test_url = test_url.ReplaceComponents(replacements);
185 185
186 scoped_refptr<TabProxy> tab(GetActiveTab()); 186 scoped_refptr<TabProxy> tab(GetActiveTab());
187 ASSERT_TRUE(tab.get()); 187 ASSERT_TRUE(tab.get());
188 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url)); 188 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
189 189
190 // Wait for the test to finish. 190 // Wait for the test to finish.
191 ASSERT_TRUE(WaitUntilCookieValue( 191 ASSERT_TRUE(WaitUntilCookieValue(
192 tab.get(), test_url, "__pc_done", 192 tab.get(), test_url, "__pc_done",
193 TestTimeouts::huge_test_timeout_ms(), "1")); 193 TestTimeouts::large_test_timeout_ms(), "1"));
194 194
195 std::string cookie; 195 std::string cookie;
196 ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie)); 196 ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie));
197 pages->assign(UTF8ToWide(cookie)); 197 pages->assign(UTF8ToWide(cookie));
198 ASSERT_FALSE(pages->empty()); 198 ASSERT_FALSE(pages->empty());
199 199
200 // Get the timing cookie value from the DOM automation. 200 // Get the timing cookie value from the DOM automation.
201 std::wstring wcookie; 201 std::wstring wcookie;
202 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", 202 ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
203 L"window.domAutomationController.send(" 203 L"window.domAutomationController.send("
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 PAGE_CYCLER_DATABASE_TESTS("delete-transactions", 527 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
528 DeleteTransactions); 528 DeleteTransactions);
529 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions", 529 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
530 PseudoRandomTransactions); 530 PseudoRandomTransactions);
531 #endif 531 #endif
532 532
533 // Indexed DB tests. 533 // Indexed DB tests.
534 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert); 534 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
535 535
536 } // namespace 536 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/perf/frame_rate/frame_rate_tests.cc ('k') | chrome/test/perf/sunspider_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698