Fix suppress flaky test RecentTabsSubMenuModelTest MaxSessionsAndRecency

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc

 // Copyright 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 "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 478 matching lines @@
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(7, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(8, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(9, &url, &title));
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(10, &url, &title));
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(11, &url, &title));
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(12, &url, &title));
 }
 
 // Per http://crbug.com/603744, MaxSessionsAndRecenty fails intermittently on
 // windows and linux.
-#if defined(WIN) || defined(LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX)
 #define MAYBE_MaxSessionsAndRecency DISABLED_MaxSessionsAndRecency
 #else
 #define MAYBE_MaxSessionsAndRecency MaxSessionsAndRecency
 #endif
 TEST_F(RecentTabsSubMenuModelTest, MAYBE_MaxSessionsAndRecency) {
   // Create 4 sessions : each session has 1 window with 1 tab each.
   RecentTabsBuilderTestHelper recent_tabs_builder;
   for (int s = 0; s < 4; ++s) {
     recent_tabs_builder.AddSession();
     recent_tabs_builder.AddWindow(s);
@@ skipping 98 matching lines @@
   // 2           Recently closed heaer (disabled)
   // 3           <separator>
   // 4           No tabs from other Devices
 
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
   EXPECT_EQ(5, model.GetItemCount());
   EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2));
   EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3));
   EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4));
 }