Update defaults for InstantExtended.

chrome/browser/history/history_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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_browser_thread.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Note: WaitableEvent is not used for synchronization between the main thread
@@ skipping 20 matching lines @@
  private:
   virtual ~WaitForHistoryTask() {}
 
   DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask);
 };
 
 }  // namespace
 
 class HistoryBrowserTest : public InProcessBrowserTest {
  protected:
+  virtual void SetUpOnMainThread() OVERRIDE {
+    InProcessBrowserTest::SetUpOnMainThread();
+    // Wait for the InstantNTP prerendered contents to load.
+    content::WindowedNotificationObserver observer(

[sky, 2013/10/07 20:30:59]

Why do some tests need to do this?

[samarth, 2013/10/11 22:26:04]

It's because the prerendering of the Instant NTP confuses tests that are
depending on a certain order of loads. By waiting, it's guaranteed that this
won't interfere with those tests.

Given that this ended up being needed all across the board, I decided to move
this right into InProcessBrowserTest. That will also make it easier to remove
this once we finish launching the AppCached NTP (which doesn't require any
prerendering).

+        content::NOTIFICATION_LOAD_STOP,
+        content::NotificationService::AllSources());
+    observer.Wait();
+  }
+
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kEnableFileCookies);
   }
 
   PrefService* GetPrefs() {
     return GetProfile()->GetPrefs();
   }
 
   Profile* GetProfile() {
     return browser()->profile();
@@ skipping 229 matching lines @@
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, InvalidURLNoHistory) {
   GURL non_existant = ui_test_utils::GetTestUrl(
       base::FilePath().AppendASCII("History"),
       base::FilePath().AppendASCII("non_existant_file.html"));
   ui_test_utils::NavigateToURL(browser(), non_existant);
   ExpectEmptyHistory();
 }
 
 // New tab page should not show up in history.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, NewTabNoHistory) {
-  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB,
+      ui_test_utils::BROWSER_TEST_NONE);
   ExpectEmptyHistory();
 }
 
 // Incognito browsing should not show up in history.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, IncognitoNoHistory) {
   ui_test_utils::NavigateToURL(CreateIncognitoBrowser(), GetTestUrl());
   ExpectEmptyHistory();
 }
 
 // Multiple navigations to the same url should have a single history.
@@ skipping 175 matching lines @@
 
   content::WebContents* active_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(web_contents, active_web_contents);
   ASSERT_EQ(history_url, active_web_contents->GetURL());
 
   content::WebContents* second_tab =
       browser()->tab_strip_model()->GetWebContentsAt(1);
   ASSERT_NE(history_url, second_tab->GetURL());
 }