OLD | NEW |
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/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 } | 70 } |
71 | 71 |
72 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
73 ASSERT_TRUE(tracing::BeginTracing("-test_*")); | 73 ASSERT_TRUE(tracing::BeginTracing("-test_*")); |
74 #endif | 74 #endif |
75 | 75 |
76 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 76 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
77 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); | 77 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); |
78 browser()->window()->SetBounds(new_bounds); | 78 browser()->window()->SetBounds(new_bounds); |
79 | 79 |
80 ui_test_utils::DOMMessageQueue message_queue; | 80 content::DOMMessageQueue message_queue; |
81 ui_test_utils::NavigateToURL(browser(), GURL(url)); | 81 ui_test_utils::NavigateToURL(browser(), GURL(url)); |
82 | 82 |
83 // Wait for notification that the test completed. | 83 // Wait for notification that the test completed. |
84 std::string message; | 84 std::string message; |
85 ASSERT_TRUE(message_queue.WaitForMessage(&message)); | 85 ASSERT_TRUE(message_queue.WaitForMessage(&message)); |
86 message_queue.ClearQueue(); | 86 message_queue.ClearQueue(); |
87 // TODO(kbr): figure out why this is escaped | 87 // TODO(kbr): figure out why this is escaped |
88 EXPECT_EQ("\"FINISHED\"", message); | 88 EXPECT_EQ("\"FINISHED\"", message); |
89 | 89 |
90 // Take a snapshot of the web page and compare it to the test | 90 // Take a snapshot of the web page and compare it to the test |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
315 // This test is being marked MANUAL so that it does not run | 315 // This test is being marked MANUAL so that it does not run |
316 // automatically yet, but can be run on demand with the --run-manual | 316 // automatically yet, but can be run on demand with the --run-manual |
317 // command line argument. More work is needed to get the test harness | 317 // command line argument. More work is needed to get the test harness |
318 // running on the bots, and to fix flakiness in the test. | 318 // running on the bots, and to fix flakiness in the test. |
319 IN_PROC_BROWSER_TEST_F(MapsGLEnduranceTest, MANUAL_SingleRunBasic) { | 319 IN_PROC_BROWSER_TEST_F(MapsGLEnduranceTest, MANUAL_SingleRunBasic) { |
320 // This expects the MapsGL python server to be running. | 320 // This expects the MapsGL python server to be running. |
321 RunSingleTest(gfx::Size(1024, 768), | 321 RunSingleTest(gfx::Size(1024, 768), |
322 "http://localhost:8000/basic.html", | 322 "http://localhost:8000/basic.html", |
323 "mapsgl_single_run_basic_expectations.json"); | 323 "mapsgl_single_run_basic_expectations.json"); |
324 } | 324 } |
OLD | NEW |