Rework of ResourcePrefetchPredictor browser tests infrastructure.

chrome/test/base/ui_test_utils.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/base/ui_test_utils.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 195 matching lines @@
     // We've opened up a new tab, but not selected it.
     TabStripModel* tab_strip = browser->tab_strip_model();
     web_contents = tab_strip->GetWebContentsAt(tab_strip->active_index() + 1);
     EXPECT_TRUE(web_contents != NULL)
         << " Unable to wait for navigation to \"" << url.spec()
         << "\" because the new tab is not available yet";
     if (!web_contents)
       return;
   } else if ((disposition == WindowOpenDisposition::CURRENT_TAB) ||
              (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) ||
-             (disposition == WindowOpenDisposition::SINGLETON_TAB)) {
+             (disposition == WindowOpenDisposition::SINGLETON_TAB) ||
+             (disposition == WindowOpenDisposition::NEW_POPUP)) {

[ahemery, 2016/12/07 14:13:02]

I believe this one was just forgotten. Behavior was buggy with
NEW_POPUP+NAVIGATION.

[alexilin, 2016/12/07 16:57:11]

We don't need it for this CL anymore.

     // The currently selected tab is the right one.
     web_contents = browser->tab_strip_model()->GetActiveWebContents();
   }
   if (disposition == WindowOpenDisposition::CURRENT_TAB) {
     same_tab_observer.Wait();
     return;
   } else if (web_contents) {
     content::TestNavigationObserver observer(web_contents,
                                              number_of_navigations);
     observer.Wait();
@@ skipping 334 matching lines @@
   if (browser != browser_)
     return;
 
   observed_ = true;
   BrowserList::RemoveObserver(this);
   if (message_loop_runner_.get() && message_loop_runner_->loop_running())
     message_loop_runner_->Quit();
 }
 
 }  // namespace ui_test_utils