Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: chrome/browser/ui/webui/options/options_ui_browsertest.cc

Issue 1021233002: Disable OptionsUIBrowserTest.VerifyManagedSignout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@disable_rssparsevalidfeed
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 win_rel when the profile is deleted crbug.com/103355 189 // Flaky on Mac and Win: http://crbug.com/469113
190 // Also related to crbug.com/104851 190 #if defined(OS_WIN) || defined(OS_MACOSX)
191 #if defined(OS_WIN)
192 #define MAYBE_VerifyManagedSignout DISABLED_VerifyManagedSignout 191 #define MAYBE_VerifyManagedSignout DISABLED_VerifyManagedSignout
193 #else 192 #else
194 #define MAYBE_VerifyManagedSignout VerifyManagedSignout 193 #define MAYBE_VerifyManagedSignout VerifyManagedSignout
195 #endif 194 #endif
196 195
197 #if !defined(OS_CHROMEOS) 196 #if !defined(OS_CHROMEOS)
198 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, MAYBE_VerifyManagedSignout) { 197 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, MAYBE_VerifyManagedSignout) {
199 SigninManager* signin = 198 SigninManager* signin =
200 SigninManagerFactory::GetForProfile(browser()->profile()); 199 SigninManagerFactory::GetForProfile(browser()->profile());
201 signin->OnExternalSigninCompleted("test@example.com"); 200 signin->OnExternalSigninCompleted("test@example.com");
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 run_loop.Run(); 323 run_loop.Run();
325 324
326 // Verify that the settings page has updated and lists two profiles. 325 // Verify that the settings page has updated and lists two profiles.
327 ASSERT_TRUE(content::ExecuteScriptAndExtractInt( 326 ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
328 contents, javascript, &profiles)); 327 contents, javascript, &profiles));
329 EXPECT_EQ(2, profiles); 328 EXPECT_EQ(2, profiles);
330 } 329 }
331 #endif 330 #endif
332 331
333 } // namespace options 332 } // namespace options
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698