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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui_browsertest.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/ui/webui/options2/options_ui2_browsertest.h" 6 #include "chrome/browser/ui/webui/options2/options_ui_browsertest.h"
7 #include "chrome/common/chrome_switches.h" 7 #include "chrome/common/chrome_switches.h"
8 8
9 namespace { 9 namespace {
10 10
11 // Same as OptionsBrowserTest but launches with Guest mode command line 11 // Same as OptionsBrowserTest but launches with Guest mode command line
12 // switches. 12 // switches.
13 class GuestModeOptionsBrowserTest : public options2::OptionsBrowserTest { 13 class GuestModeOptionsBrowserTest : public options2::OptionsBrowserTest {
14 public: 14 public:
15 GuestModeOptionsBrowserTest() : OptionsBrowserTest() {} 15 GuestModeOptionsBrowserTest() : OptionsBrowserTest() {}
16 16
17 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 17 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
18 command_line->AppendSwitch(switches::kGuestSession); 18 command_line->AppendSwitch(switches::kGuestSession);
19 command_line->AppendSwitch(switches::kIncognito); 19 command_line->AppendSwitch(switches::kIncognito);
20 } 20 }
21 }; 21 };
22 22
23 // See http://crbug.com/126224 23 // See http://crbug.com/126224
24 #if defined(ADDRESS_SANITIZER) 24 #if defined(ADDRESS_SANITIZER)
25 #define MAYBE_LoadOptionsByURL DISABLED_LoadOptionsByURL 25 #define MAYBE_LoadOptionsByURL DISABLED_LoadOptionsByURL
26 #else 26 #else
27 #define MAYBE_LoadOptionsByURL LoadOptionsByURL 27 #define MAYBE_LoadOptionsByURL LoadOptionsByURL
28 #endif // defined(ADDRESS_SANITIZER) 28 #endif // defined(ADDRESS_SANITIZER)
29 IN_PROC_BROWSER_TEST_F(GuestModeOptionsBrowserTest, MAYBE_LoadOptionsByURL) { 29 IN_PROC_BROWSER_TEST_F(GuestModeOptionsBrowserTest, MAYBE_LoadOptionsByURL) {
30 NavigateToSettings(); 30 NavigateToSettings();
31 VerifyTitle(); 31 VerifyTitle();
32 VerifyNavbar(); 32 VerifyNavbar();
33 } 33 }
34 34
35 } // namespace 35 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698