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

Side by Side Diff: chrome/test/gpu/gpu_mapsgl_endurance_browsertest.cc

Issue 11414223: Move the test functions that deal with focus to interactive_ui_tets_utils.h and into the interactiv… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <cmath> 5 #include <cmath>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 if (!ReadTestExpectations(test_expectations_path, &expectations)) { 73 if (!ReadTestExpectations(test_expectations_path, &expectations)) {
74 LOG(ERROR) << "Failed to read test expectations from file " 74 LOG(ERROR) << "Failed to read test expectations from file "
75 << test_expectations_path.value(); 75 << test_expectations_path.value();
76 return; 76 return;
77 } 77 }
78 78
79 #if defined(OS_WIN) 79 #if defined(OS_WIN)
80 ASSERT_TRUE(tracing::BeginTracing("-test_*")); 80 ASSERT_TRUE(tracing::BeginTracing("-test_*"));
81 #endif 81 #endif
82 82
83 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); 83 browser()->window()->Activate();
jam 2012/11/29 07:06:43 this was copied from gpu_pixel_browsertest.cc
84 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); 84 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size);
85 browser()->window()->SetBounds(new_bounds); 85 browser()->window()->SetBounds(new_bounds);
86 86
87 content::DOMMessageQueue message_queue; 87 content::DOMMessageQueue message_queue;
88 ui_test_utils::NavigateToURL(browser(), GURL(url)); 88 ui_test_utils::NavigateToURL(browser(), GURL(url));
89 89
90 // Wait for notification that the test completed. 90 // Wait for notification that the test completed.
91 std::string message; 91 std::string message;
92 ASSERT_TRUE(message_queue.WaitForMessage(&message)); 92 ASSERT_TRUE(message_queue.WaitForMessage(&message));
93 message_queue.ClearQueue(); 93 message_queue.ClearQueue();
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // automatically yet, but can be run on demand with the --run-manual 338 // automatically yet, but can be run on demand with the --run-manual
339 // command line argument. More work is needed to get the test harness 339 // command line argument. More work is needed to get the test harness
340 // running on the bots, and to fix flakiness in the test. 340 // running on the bots, and to fix flakiness in the test.
341 IN_PROC_BROWSER_TEST_F(MapsGLEnduranceTest, MANUAL_SingleRunBasic) { 341 IN_PROC_BROWSER_TEST_F(MapsGLEnduranceTest, MANUAL_SingleRunBasic) {
342 // This expects the MapsGL python server to be running. 342 // This expects the MapsGL python server to be running.
343 RunSingleTest(gfx::Size(1024, 768), 343 RunSingleTest(gfx::Size(1024, 768),
344 "http://localhost:8000/basic.html", 344 "http://localhost:8000/basic.html",
345 "mapsgl_single_run_basic_expectations.json", 345 "mapsgl_single_run_basic_expectations.json",
346 "single-run-basic"); 346 "single-run-basic");
347 } 347 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698