Mark OptionsBorwserTest.LoadOptionsByURL flaky on all platforms.

BUG=chromium:119671
TEST=None
TBR=jam@chromium.org, csilv@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10332175

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137139 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/webui/options2/options_ui2_browsertest.cc

@@ -40,14 +40,8 @@ void OptionsBrowserTest::VerifyTitle() {
   EXPECT_NE(title.find(expected_title), string16::npos);
 }
 
-// Observed flaky on Win and Mac, see http://crbug.com/119671.
-#if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_LoadOptionsByURL FLAKY_LoadOptionsByURL
-#else
-#define MAYBE_LoadOptionsByURL LoadOptionsByURL
-#endif
-
-IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, MAYBE_LoadOptionsByURL) {
+// Flaky, see http://crbug.com/119671.
+IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {
   NavigateToSettings();
   VerifyTitle();
   VerifyNavbar();