OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 <map> | 5 #include <map> |
6 #include <set> | 6 #include <set> |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 2135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2146 EXPECT_EQ(kPublicSessionLocale, g_browser_process->GetApplicationLocale()); | 2146 EXPECT_EQ(kPublicSessionLocale, g_browser_process->GetApplicationLocale()); |
2147 EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale), | 2147 EXPECT_EQ(l10n_util::GetLanguage(kPublicSessionLocale), |
2148 icu::Locale::getDefault().getLanguage()); | 2148 icu::Locale::getDefault().getLanguage()); |
2149 EXPECT_EQ(public_session_input_method_id_, | 2149 EXPECT_EQ(public_session_input_method_id_, |
2150 chromeos::input_method::InputMethodManager::Get() | 2150 chromeos::input_method::InputMethodManager::Get() |
2151 ->GetActiveIMEState() | 2151 ->GetActiveIMEState() |
2152 ->GetCurrentInputMethod() | 2152 ->GetCurrentInputMethod() |
2153 .id()); | 2153 .id()); |
2154 } | 2154 } |
2155 | 2155 |
2156 // Test fails under MSan, http://crbug.com/446950 | 2156 // Test fails under MSan and is flaky on regular bots: http://crbug.com/446950 |
2157 #if defined(MEMORY_SANITIZER) | 2157 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_PolicyForExtensions) { |
2158 #define MAYBE_PolicyForExtensions DISABLED_PolicyForExtensions | |
2159 #else | |
2160 #define MAYBE_PolicyForExtensions PolicyForExtensions | |
2161 #endif | |
2162 | |
2163 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, MAYBE_PolicyForExtensions) { | |
2164 // Set up a test update server for the Show Managed Storage app. | 2158 // Set up a test update server for the Show Managed Storage app. |
2165 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 2159 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
2166 TestingUpdateManifestProvider testing_update_manifest_provider( | 2160 TestingUpdateManifestProvider testing_update_manifest_provider( |
2167 kRelativeUpdateURL); | 2161 kRelativeUpdateURL); |
2168 testing_update_manifest_provider.AddUpdate( | 2162 testing_update_manifest_provider.AddUpdate( |
2169 kShowManagedStorageID, | 2163 kShowManagedStorageID, |
2170 kShowManagedStorageVersion, | 2164 kShowManagedStorageVersion, |
2171 embedded_test_server()->GetURL(std::string("/") + | 2165 embedded_test_server()->GetURL(std::string("/") + |
2172 kShowManagedStorageCRXPath)); | 2166 kShowManagedStorageCRXPath)); |
2173 embedded_test_server()->RegisterRequestHandler( | 2167 embedded_test_server()->RegisterRequestHandler( |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2395 ASSERT_TRUE(content::ExecuteScript(contents_, | 2389 ASSERT_TRUE(content::ExecuteScript(contents_, |
2396 "$('tos-accept-button').click();")); | 2390 "$('tos-accept-button').click();")); |
2397 | 2391 |
2398 WaitForSessionStart(); | 2392 WaitForSessionStart(); |
2399 } | 2393 } |
2400 | 2394 |
2401 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, | 2395 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, |
2402 TermsOfServiceDownloadTest, testing::Bool()); | 2396 TermsOfServiceDownloadTest, testing::Bool()); |
2403 | 2397 |
2404 } // namespace policy | 2398 } // namespace policy |
OLD | NEW |