Fix ChromeMainTest tests on CrOS.

chrome/browser/chrome_main_browsertest.cc

 // 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 "chrome/test/ui/ui_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_util.h"
 
 // These tests don't apply to the Mac version; see GetCommandLineForRelaunch
 // for details.
 #if !defined(OS_MACOSX)
 
-// These tests hang on the build/try bot but pass locally with chromeos=1
-// builds. jam is investigatin
-#if !defined(OS_CHROMEOS)
-
 class ChromeMainTest : public InProcessBrowserTest {
  public:
   ChromeMainTest() {}
 
   void Relaunch(const CommandLine& new_command_line) {
     base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL);
   }
 };
 
 // Make sure that the second invocation creates a new window.
@@ skipping 78 matching lines @@
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
   Relaunch(new_command_line);
   tab_observer.Wait();
 
   // There should be one normal and one incognito window now.
   ASSERT_EQ(2u, BrowserList::size());
   ASSERT_EQ(1u, BrowserList::GetBrowserCountForType(profile, true));
 }
 
-#endif  // !OS_CHROMEOS
-
 #endif  // !OS_MACOSX