summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 07:38:09 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-24 07:38:09 +0000
commit3973aec8081125d6179bc384d94252eadb03d1ec (patch)
treef4f6fe08e5e5392283557ec64229e5949f119a07 /chrome
parent4219c14ef439b65f5a1bc73b7c1fd1403bfef7a8 (diff)
downloadchromium_src-3973aec8081125d6179bc384d94252eadb03d1ec.zip
chromium_src-3973aec8081125d6179bc384d94252eadb03d1ec.tar.gz
chromium_src-3973aec8081125d6179bc384d94252eadb03d1ec.tar.bz2
WebKit roll 81851:81856
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/webui/options/options_ui_uitest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/ui/webui/options/options_ui_uitest.cc b/chrome/browser/ui/webui/options/options_ui_uitest.cc
index 355471a..d6061aa 100644
--- a/chrome/browser/ui/webui/options/options_ui_uitest.cc
+++ b/chrome/browser/ui/webui/options/options_ui_uitest.cc
@@ -35,14 +35,7 @@ class OptionsUITest : public UITest {
}
};
-// http://crbug.com/77252
-#if !defined(NDEBUG)
-#define MAYBE_LoadOptionsByURL DISABLED_LoadOptionsByURL
-#else
-#define MAYBE_LoadOptionsByURL
-#endif
-
-TEST_F(OptionsUITest, MAYBE_LoadOptionsByURL) {
+TEST_F(OptionsUITest, LoadOptionsByURL) {
scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
ASSERT_TRUE(browser.get());