| 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/remoting/qunit_browser_test_runner.h" | 5 #include "chrome/test/remoting/qunit_browser_test_runner.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
| 14 #include "net/base/filename_util.h" | 14 #include "net/base/filename_util.h" |
| 15 | 15 |
| 16 void QUnitBrowserTestRunner::QUnitStart(content::WebContents* web_contents) { | 16 void QUnitBrowserTestRunner::QUnitStart(content::WebContents* web_contents) { |
| 17 std::string result; | 17 std::string result; |
| (...skipping 26 matching lines...) Expand all Loading... |
| 44 << file.value() << "> does not exist."; | 44 << file.value() << "> does not exist."; |
| 45 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(file)); | 45 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(file)); |
| 46 | 46 |
| 47 content::WebContents* web_contents = | 47 content::WebContents* web_contents = |
| 48 browser()->tab_strip_model()->GetActiveWebContents(); | 48 browser()->tab_strip_model()->GetActiveWebContents(); |
| 49 ASSERT_TRUE(web_contents); | 49 ASSERT_TRUE(web_contents); |
| 50 | 50 |
| 51 std::string result; | 51 std::string result; |
| 52 QUnitStart(web_contents); | 52 QUnitStart(web_contents); |
| 53 } | 53 } |
| OLD | NEW |