Fix flakiness and enable RenderViewHostManagerTest on Linux/Mac.

chrome/test/ui_test_utils.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_TEST_UI_TEST_UTILS_H_
 #define CHROME_TEST_UI_TEST_UTILS_H_
 #pragma once
 
 #include <map>
 #include <queue>
@@ skipping 91 matching lines @@
 // the specified number of navigations complete.
 void WaitForNavigations(NavigationController* controller,
                         int number_of_navigations);
 
 // Waits for a new tab to be added to |browser|.
 void WaitForNewTab(Browser* browser);
 
 // Waits for a |browser_action| to be updated.
 void WaitForBrowserActionUpdated(ExtensionAction* browser_action);
 
-// Waits for a load stop for the specified |controller|.
-void WaitForLoadStop(NavigationController* controller);
+// Waits for a load stop for the specified |tab|'s controller, if the tab is
+// currently loading.

[Paweł Hajdan Jr., 2011/03/25 09:39:42]

nit: Please either remove the "if the tab is currently loading" part, or add
"otherwise returns immediately".

[Charlie Reis, 2011/03/25 19:46:03]

Done (and landed).

+void WaitForLoadStop(TabContents* tab);
 
 // Waits for a new browser to be created, returning the browser.
 Browser* WaitForNewBrowser();
 
 // Waits for a new browser to be created, returning the browser.
 // Pass in the number of browsers that exist before the navigation starts in
 // |start_count|, and it will exit even if the notification occurs before it's
 // called.
 Browser* WaitForNewBrowserWithCount(size_t start_count);
 
@@ skipping 431 matching lines @@
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_UI_TEST_UTILS_H_