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

Side by Side Diff: chrome/test/perf/v8_benchmark_uitest.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, 3 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/url_fetch_test.cc ('k') | no next file » | 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 private: 56 private:
57 // Return the path to the V8 benchmark directory on the local filesystem. 57 // Return the path to the V8 benchmark directory on the local filesystem.
58 FilePath GetV8BenchmarkDir() { 58 FilePath GetV8BenchmarkDir() {
59 FilePath test_dir; 59 FilePath test_dir;
60 PathService::Get(chrome::DIR_TEST_DATA, &test_dir); 60 PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
61 return test_dir.AppendASCII("v8_benchmark"); 61 return test_dir.AppendASCII("v8_benchmark");
62 } 62 }
63 63
64 bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) { 64 bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
65 return WaitUntilCookieValue(tab, test_url, "__done", 65 return WaitUntilCookieValue(tab, test_url, "__done",
66 TestTimeouts::huge_test_timeout_ms(), "1"); 66 TestTimeouts::large_test_timeout_ms(), "1");
67 } 67 }
68 68
69 bool GetScore(TabProxy* tab, std::string* score) { 69 bool GetScore(TabProxy* tab, std::string* score) {
70 std::wstring score_wide; 70 std::wstring score_wide;
71 bool succeeded = tab->ExecuteAndExtractString(L"", 71 bool succeeded = tab->ExecuteAndExtractString(L"",
72 L"window.domAutomationController.send(automation.GetScore());", 72 L"window.domAutomationController.send(automation.GetScore());",
73 &score_wide); 73 &score_wide);
74 74
75 // Note that we don't use ASSERT_TRUE here (and in some other places) as it 75 // Note that we don't use ASSERT_TRUE here (and in some other places) as it
76 // doesn't work inside a function with a return type other than void. 76 // doesn't work inside a function with a return type other than void.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #endif 144 #endif
145 145
146 TEST_F(V8BenchmarkReferenceTest, MAYBE_Perf) { 146 TEST_F(V8BenchmarkReferenceTest, MAYBE_Perf) {
147 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunV8Benchmark)) 147 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunV8Benchmark))
148 return; 148 return;
149 149
150 RunTest(); 150 RunTest();
151 } 151 }
152 152
153 } // namespace 153 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/perf/url_fetch_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698