OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 // This entire test suite relies on the translate infobar which has been removed | 5 // This entire test suite relies on the translate infobar which has been removed |
6 // from Aura. The file should be ported to use the bubble. | 6 // from Aura. The file should be ported to use the bubble. |
7 #if !defined(USE_AURA) | 7 #if !defined(USE_AURA) |
8 | 8 |
9 #include <stddef.h> | 9 #include <stddef.h> |
10 | 10 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 void SetUp() override { | 63 void SetUp() override { |
64 set_open_about_blank_on_browser_launch(false); | 64 set_open_about_blank_on_browser_launch(false); |
65 translate::TranslateManager::SetIgnoreMissingKeyForTesting(true); | 65 translate::TranslateManager::SetIgnoreMissingKeyForTesting(true); |
66 InProcessBrowserTest::SetUp(); | 66 InProcessBrowserTest::SetUp(); |
67 } | 67 } |
68 | 68 |
69 void SetUpOnMainThread() override { | 69 void SetUpOnMainThread() override { |
70 net::EmbeddedTestServer* test_server = embedded_test_server(); | 70 net::EmbeddedTestServer* test_server = embedded_test_server(); |
71 test_server->ServeFilesFromSourceDirectory(kTranslateRoot); | 71 test_server->ServeFilesFromSourceDirectory(kTranslateRoot); |
72 ASSERT_TRUE(test_server->Start()); | 72 ASSERT_TRUE(test_server->Start()); |
73 InProcessBrowserTest::SetUpOnMainThread(); | |
74 } | 73 } |
75 | 74 |
76 protected: | 75 protected: |
77 GURL GetNonSecureURL(const std::string& path) const { | 76 GURL GetNonSecureURL(const std::string& path) const { |
78 return embedded_test_server()->GetURL(path); | 77 return embedded_test_server()->GetURL(path); |
79 } | 78 } |
80 | 79 |
81 private: | 80 private: |
82 DISALLOW_COPY_AND_ASSIGN(TranslateBaseBrowserTest); | 81 DISALLOW_COPY_AND_ASSIGN(TranslateBaseBrowserTest); |
83 }; | 82 }; |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) { | 293 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) { |
295 ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI( | 294 ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI( |
296 kUpdateLocationTestPath, false)); | 295 kUpdateLocationTestPath, false)); |
297 } | 296 } |
298 | 297 |
299 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) { | 298 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) { |
300 ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI( | 299 ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI( |
301 kUpdateLocationAtOnloadTestPath, false)); | 300 kUpdateLocationAtOnloadTestPath, false)); |
302 } | 301 } |
303 #endif // !defined(USE_AURA) | 302 #endif // !defined(USE_AURA) |
OLD | NEW |