| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/ui/webui/options/options_ui_browsertest.h" | 5 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/scoped_observer.h" | 8 #include "base/scoped_observer.h" |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 browser()->tab_strip_model()->GetActiveWebContents(), | 179 browser()->tab_strip_model()->GetActiveWebContents(), |
| 180 base::Bind(&FrameHasSettingsSourceHost)); | 180 base::Bind(&FrameHasSettingsSourceHost)); |
| 181 } | 181 } |
| 182 | 182 |
| 183 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, LoadOptionsByURL) { | 183 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, LoadOptionsByURL) { |
| 184 NavigateToSettings(); | 184 NavigateToSettings(); |
| 185 VerifyTitle(); | 185 VerifyTitle(); |
| 186 VerifyNavbar(); | 186 VerifyNavbar(); |
| 187 } | 187 } |
| 188 | 188 |
| 189 // Flaky on Mac and Win: http://crbug.com/469113 | 189 // Flaky on Linux, Mac and Win: http://crbug.com/469113 |
| 190 #if defined(OS_WIN) || defined(OS_MACOSX) | 190 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |
| 191 #define MAYBE_VerifyManagedSignout DISABLED_VerifyManagedSignout | 191 #define MAYBE_VerifyManagedSignout DISABLED_VerifyManagedSignout |
| 192 #else | 192 #else |
| 193 #define MAYBE_VerifyManagedSignout VerifyManagedSignout | 193 #define MAYBE_VerifyManagedSignout VerifyManagedSignout |
| 194 #endif | 194 #endif |
| 195 | 195 |
| 196 #if !defined(OS_CHROMEOS) | 196 #if !defined(OS_CHROMEOS) |
| 197 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, MAYBE_VerifyManagedSignout) { | 197 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, MAYBE_VerifyManagedSignout) { |
| 198 SigninManager* signin = | 198 SigninManager* signin = |
| 199 SigninManagerFactory::GetForProfile(browser()->profile()); | 199 SigninManagerFactory::GetForProfile(browser()->profile()); |
| 200 signin->OnExternalSigninCompleted("test@example.com"); | 200 signin->OnExternalSigninCompleted("test@example.com"); |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 run_loop.Run(); | 323 run_loop.Run(); |
| 324 | 324 |
| 325 // Verify that the settings page has updated and lists two profiles. | 325 // Verify that the settings page has updated and lists two profiles. |
| 326 ASSERT_TRUE(content::ExecuteScriptAndExtractInt( | 326 ASSERT_TRUE(content::ExecuteScriptAndExtractInt( |
| 327 contents, javascript, &profiles)); | 327 contents, javascript, &profiles)); |
| 328 EXPECT_EQ(2, profiles); | 328 EXPECT_EQ(2, profiles); |
| 329 } | 329 } |
| 330 #endif | 330 #endif |
| 331 | 331 |
| 332 } // namespace options | 332 } // namespace options |
| OLD | NEW |