| 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 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chrome_notification_types.h" | 9 #include "chrome/browser/chrome_notification_types.h" |
| 10 #include "chrome/browser/infobars/infobar.h" | 10 #include "chrome/browser/infobars/infobar.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 119 |
| 120 private: | 120 private: |
| 121 net::SpawnedTestServer https_server_; | 121 net::SpawnedTestServer https_server_; |
| 122 InfoBarService* infobar_service_; | 122 InfoBarService* infobar_service_; |
| 123 | 123 |
| 124 typedef net::SpawnedTestServer::SSLOptions SSLOptions; | 124 typedef net::SpawnedTestServer::SSLOptions SSLOptions; |
| 125 | 125 |
| 126 DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest); | 126 DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest); |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) { | 129 // Disabled - http://crbug.com/359730 (js has syntax errors which v8 hates) |
| 130 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, |
| 131 DISABLED_TranslateInIsolatedWorld) { |
| 130 #if defined(OS_WIN) && defined(USE_ASH) | 132 #if defined(OS_WIN) && defined(USE_ASH) |
| 131 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 133 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 132 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 134 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 133 return; | 135 return; |
| 134 #endif | 136 #endif |
| 135 | 137 |
| 136 net::TestURLFetcherFactory factory; | 138 net::TestURLFetcherFactory factory; |
| 137 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 139 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| 138 | 140 |
| 139 // Check if there is no Translate infobar. | 141 // Check if there is no Translate infobar. |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 GetNonSecureURL(kUpdateLocationAtOnloadTestPath)); | 360 GetNonSecureURL(kUpdateLocationAtOnloadTestPath)); |
| 359 | 361 |
| 360 // Wait for the page title is changed after the test finished. | 362 // Wait for the page title is changed after the test finished. |
| 361 const base::string16 result = watcher.WaitAndGetTitle(); | 363 const base::string16 result = watcher.WaitAndGetTitle(); |
| 362 EXPECT_EQ("PASS", base::UTF16ToASCII(result)); | 364 EXPECT_EQ("PASS", base::UTF16ToASCII(result)); |
| 363 | 365 |
| 364 // Check if there is no Translate infobar. | 366 // Check if there is no Translate infobar. |
| 365 translate = GetExistingTranslateInfoBarDelegate(); | 367 translate = GetExistingTranslateInfoBarDelegate(); |
| 366 EXPECT_FALSE(translate); | 368 EXPECT_FALSE(translate); |
| 367 } | 369 } |
| OLD | NEW |