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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_browsertest.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_browsertest.cc b/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_browsertest.cc
deleted file mode 100644
index 44b6e7fe2c1350efb1dc8eadcc2240b687196af1..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_browsertest.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/command_line.h"
-#include "chrome/browser/ui/webui/options2/options_ui2_browsertest.h"
-#include "chrome/common/chrome_switches.h"
-
-namespace {
-
-// Same as OptionsBrowserTest but launches with Guest mode command line
-// switches.
-class GuestModeOptionsBrowserTest : public options2::OptionsBrowserTest {
- public:
- GuestModeOptionsBrowserTest() : OptionsBrowserTest() {}
-
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
- command_line->AppendSwitch(switches::kGuestSession);
- command_line->AppendSwitch(switches::kIncognito);
- }
-};
-
-// See http://crbug.com/126224
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_LoadOptionsByURL DISABLED_LoadOptionsByURL
-#else
-#define MAYBE_LoadOptionsByURL LoadOptionsByURL
-#endif // defined(ADDRESS_SANITIZER)
-IN_PROC_BROWSER_TEST_F(GuestModeOptionsBrowserTest, MAYBE_LoadOptionsByURL) {
- NavigateToSettings();
- VerifyTitle();
- VerifyNavbar();
-}
-
-} // namespace

Powered by Google App Engine
This is Rietveld 408576698