| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/test/base/web_ui_browser_test.h" | 5 #include "chrome/test/base/web_ui_browser_test.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 libraries_preloaded_ = true; | 207 libraries_preloaded_ = true; |
| 208 } | 208 } |
| 209 | 209 |
| 210 void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) { | 210 void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) { |
| 211 content::WebContents* web_contents = | 211 content::WebContents* web_contents = |
| 212 browser()->tab_strip_model()->GetActiveWebContents(); | 212 browser()->tab_strip_model()->GetActiveWebContents(); |
| 213 WebUIJsInjectionReadyObserver injection_observer( | 213 WebUIJsInjectionReadyObserver injection_observer( |
| 214 web_contents, this, preload_test_fixture_, preload_test_name_); | 214 web_contents, this, preload_test_fixture_, preload_test_name_); |
| 215 content::TestNavigationObserver navigation_observer(web_contents); | 215 content::TestNavigationObserver navigation_observer(web_contents); |
| 216 chrome::NavigateParams params( | 216 chrome::NavigateParams params( |
| 217 browser(), GURL(browse_to), content::PAGE_TRANSITION_TYPED); | 217 browser(), GURL(browse_to), ui::PAGE_TRANSITION_TYPED); |
| 218 params.disposition = CURRENT_TAB; | 218 params.disposition = CURRENT_TAB; |
| 219 chrome::Navigate(¶ms); | 219 chrome::Navigate(¶ms); |
| 220 navigation_observer.Wait(); | 220 navigation_observer.Wait(); |
| 221 } | 221 } |
| 222 | 222 |
| 223 #if defined(ENABLE_FULL_PRINTING) | 223 #if defined(ENABLE_FULL_PRINTING) |
| 224 | 224 |
| 225 // This custom ContentBrowserClient is used to get notified when a WebContents | 225 // This custom ContentBrowserClient is used to get notified when a WebContents |
| 226 // for the print preview dialog gets created. | 226 // for the print preview dialog gets created. |
| 227 class PrintContentBrowserClient : public chrome::ChromeContentBrowserClient { | 227 class PrintContentBrowserClient : public chrome::ChromeContentBrowserClient { |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 } | 476 } |
| 477 | 477 |
| 478 GURL WebUIBrowserTest::WebUITestDataPathToURL( | 478 GURL WebUIBrowserTest::WebUITestDataPathToURL( |
| 479 const base::FilePath::StringType& path) { | 479 const base::FilePath::StringType& path) { |
| 480 base::FilePath dir_test_data; | 480 base::FilePath dir_test_data; |
| 481 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data)); | 481 EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data)); |
| 482 base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path)); | 482 base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path)); |
| 483 EXPECT_TRUE(base::PathExists(test_path)); | 483 EXPECT_TRUE(base::PathExists(test_path)); |
| 484 return net::FilePathToFileURL(test_path); | 484 return net::FilePathToFileURL(test_path); |
| 485 } | 485 } |
| OLD | NEW |