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

Side by Side Diff: chrome/test/ui/sunspider_uitest.cc

Issue 149281: Sprinkle some defensiveness into the UI tests so that they don't explode if t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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/ui/dom_checker_uitest.cc ('k') | chrome/test/ui/ui_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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
(...skipping 21 matching lines...) Expand all
32 show_window_ = true; 32 show_window_ = true;
33 } 33 }
34 34
35 void RunTest() { 35 void RunTest() {
36 FilePath::StringType start_file(kStartFile); 36 FilePath::StringType start_file(kStartFile);
37 FilePath test_path = GetSunSpiderDir(); 37 FilePath test_path = GetSunSpiderDir();
38 test_path = test_path.Append(start_file); 38 test_path = test_path.Append(start_file);
39 GURL test_url(net::FilePathToFileURL(test_path)); 39 GURL test_url(net::FilePathToFileURL(test_path));
40 40
41 scoped_refptr<TabProxy> tab(GetActiveTab()); 41 scoped_refptr<TabProxy> tab(GetActiveTab());
42 ASSERT_TRUE(tab.get());
42 tab->NavigateToURL(test_url); 43 tab->NavigateToURL(test_url);
43 44
44 // Wait for the test to finish. 45 // Wait for the test to finish.
45 ASSERT_TRUE(WaitUntilTestCompletes(tab.get(), test_url)); 46 ASSERT_TRUE(WaitUntilTestCompletes(tab.get(), test_url));
46 47
47 PrintResults(tab.get()); 48 PrintResults(tab.get());
48 } 49 }
49 50
50 protected: 51 protected:
51 bool reference_; // True if this is a reference build. 52 bool reference_; // True if this is a reference build.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 146 }
146 147
147 TEST_F(SunSpiderReferenceTest, Perf) { 148 TEST_F(SunSpiderReferenceTest, Perf) {
148 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpider)) 149 if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunSunSpider))
149 return; 150 return;
150 151
151 RunTest(); 152 RunTest();
152 } 153 }
153 154
154 } // namespace 155 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/ui/dom_checker_uitest.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698