diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 22:12:10 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-28 22:12:10 +0000 |
| commit | d320698328dcfe89bbafad4b5aa23bac6ccce6bc (patch) | |
| tree | 0955a9c62bd4f9f73527ec3ef852c53477d49b5b /chrome/browser/ui | |
| parent | 15a4a86bde95cb368f30abd4f97681226bdae0d1 (diff) | |
| download | chromium_src-d320698328dcfe89bbafad4b5aa23bac6ccce6bc.zip chromium_src-d320698328dcfe89bbafad4b5aa23bac6ccce6bc.tar.gz chromium_src-d320698328dcfe89bbafad4b5aa23bac6ccce6bc.tar.bz2 | |
Reenable GuestModeOptionsUITest for Aura
BUG=104393
TEST=Test does not fail
Review URL: http://codereview.chromium.org/9475011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc index 0c762c2..443524a 100644 --- a/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc +++ b/chrome/browser/ui/webui/options/chromeos/guest_mode_options_ui_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -20,14 +20,7 @@ class GuestModeOptionsUITest : public OptionsUITest { } }; -// See bug 104393. -#if defined(USE_AURA) -#define MAYBE_LoadOptionsByURL FAILS_LoadOptionsByURL -#else -#define MAYBE_LoadOptionsByURL LoadOptionsByURL -#endif - -TEST_F(GuestModeOptionsUITest, MAYBE_LoadOptionsByURL) { +TEST_F(GuestModeOptionsUITest, LoadOptionsByURL) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); diff --git a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc b/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc index b5365ee..1a0ae10 100644 --- a/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc +++ b/chrome/browser/ui/webui/options2/chromeos/guest_mode_options_ui2_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -20,14 +20,7 @@ class GuestModeOptionsUITest : public OptionsUITest { } }; -// See bug 104393. -#if defined(USE_AURA) -#define MAYBE_LoadOptionsByURL FAILS_LoadOptionsByURL -#else -#define MAYBE_LoadOptionsByURL LoadOptionsByURL -#endif - -TEST_F(GuestModeOptionsUITest, MAYBE_LoadOptionsByURL) { +TEST_F(GuestModeOptionsUITest, LoadOptionsByURL) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); |