Chromium Code Reviews| Index: chrome/browser/net/ftp_browsertest.cc |
| diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc |
| index 2037826604f5fd41aef0844b8fbccd8fb5134511..cdc04e61cdcc0aef38148dfed9d540eec4074426 100644 |
| --- a/chrome/browser/net/ftp_browsertest.cc |
| +++ b/chrome/browser/net/ftp_browsertest.cc |
| @@ -8,7 +8,7 @@ |
| #include "build/build_config.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| -#include "chrome/test/base/in_process_browser_test.h" |
| +#include "chrome/test/base/javascript_browser_test.h" |
| #include "chrome/test/base/ui_test_utils.h" |
| #include "content/public/browser/web_contents.h" |
| #include "content/public/test/browser_test_utils.h" |
| @@ -16,7 +16,7 @@ |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "url/gurl.h" |
| -class FtpBrowserTest : public InProcessBrowserTest { |
| +class FtpBrowserTest : public JavaScriptBrowserTest { |
| public: |
| FtpBrowserTest() |
| : ftp_server_(net::SpawnedTestServer::TYPE_FTP, |
| @@ -24,6 +24,15 @@ class FtpBrowserTest : public InProcessBrowserTest { |
| base::FilePath(FILE_PATH_LITERAL("chrome/test/data/ftp"))) { |
| } |
| + void TearDownOnMainThread() override { |
| + // TODO(dbeam): should all JavaScriptBrowserTests do something like this? |
| + if (has_console_info()) { |
| + FAIL(); |
|
mmenke
2016/06/03 16:05:51
ADD_FAILURE()? The FAIL macro includes a return s
Dan Beam
2016/06/03 18:58:27
Done.
|
| + set_has_console_info(false); |
| + } |
| + JavaScriptBrowserTest::TearDownOnMainThread(); |
| + } |
| + |
| protected: |
| net::SpawnedTestServer ftp_server_; |
| }; |