Update defaults for InstantExtended.

chrome/browser/ui/browser_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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/search/instant_service.h"
+#include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
@@ skipping 894 matching lines @@
 // Test that get_process_idle_time() returns reasonable values when compared
 // with time deltas measured locally.
 IN_PROC_BROWSER_TEST_F(BrowserTest, RenderIdleTime) {
   base::TimeTicks start = base::TimeTicks::Now();
   ui_test_utils::NavigateToURL(
       browser(), ui_test_utils::GetTestUrl(
                      base::FilePath(base::FilePath::kCurrentDirectory),
                      base::FilePath(kTitle1File)));
   content::RenderProcessHost::iterator it(
       content::RenderProcessHost::AllHostsIterator());
+  const InstantService* instant_service =
+      InstantServiceFactory::GetForProfile(browser()->profile());
   for (; !it.IsAtEnd(); it.Advance()) {
+    // Ignore renderers in the Instant process (that may have been prerendered).
+    if (instant_service && instant_service->IsInstantProcess(
+        it.GetCurrentValue()->GetID())) {
+      continue;
+    }
     base::TimeDelta renderer_td =
         it.GetCurrentValue()->GetChildProcessIdleTime();
     base::TimeDelta browser_td = base::TimeTicks::Now() - start;
     EXPECT_TRUE(browser_td >= renderer_td);
   }
 }
 
 // Test IDC_CREATE_SHORTCUTS command is enabled for url scheme file, ftp, http
 // and https and disabled for chrome://, about:// etc.
 // TODO(pinkerton): Disable app-mode in the model until we implement it
@@ skipping 50 matching lines @@
   ui_test_utils::NavigateToURL(browser(), ftp_url);
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {
   CommandUpdater* command_updater =
       browser()->command_controller()->command_updater();
 
   // Urls that should not have shortcuts.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
-  ui_test_utils::NavigateToURL(browser(), new_tab_url);
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser(), new_tab_url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
   GURL history_url(chrome::kChromeUIHistoryURL);
   ui_test_utils::NavigateToURL(browser(), history_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
   GURL downloads_url(chrome::kChromeUIDownloadsURL);
   ui_test_utils::NavigateToURL(browser(), downloads_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
@@ skipping 1391 matching lines @@
 #endif
 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_GetSizeForNewRenderView) {
   ASSERT_TRUE(test_server()->Start());
   // Create an HTTPS server for cross-site transition.
   net::SpawnedTestServer https_test_server(net::SpawnedTestServer::TYPE_HTTPS,
                                            net::SpawnedTestServer::kLocalhost,
                                            base::FilePath(kDocRoot));
   ASSERT_TRUE(https_test_server.Start());
 
   // Start with NTP.
-  ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
+  ui_test_utils::NavigateToURL(browser(), GURL("chrome-internal://newtab"));
   ASSERT_EQ(BookmarkBar::DETACHED, browser()->bookmark_bar_state());
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::RenderViewHost* prev_rvh = web_contents->GetRenderViewHost();
   const int height_inset =
       browser()->window()->GetRenderViewHeightInsetWithDetachedBookmarkBar();
   const gfx::Size initial_wcv_size =
       web_contents->GetView()->GetContainerSize();
   RenderViewSizeObserver observer(web_contents, browser()->window());
 
@@ skipping 36 matching lines @@
                                     &rwhv_create_size1,
                                     &rwhv_commit_size1,
                                     &wcv_commit_size1);
   EXPECT_EQ(rwhv_create_size1, rwhv_commit_size1);
   EXPECT_EQ(rwhv_commit_size1,
             web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
   EXPECT_EQ(wcv_commit_size1, web_contents->GetView()->GetContainerSize());
 
   // Navigate from NTP to a non-NTP page, resizing WebContentsView while
   // navigation entry is pending.
-  ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab"));
+  ui_test_utils::NavigateToURL(browser(), GURL("chrome-internal://newtab"));
   gfx::Size wcv_resize_insets(-34, -57);
   observer.set_wcv_resize_insets(wcv_resize_insets);
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL("files/title2.html"));
   ASSERT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
   gfx::Size rwhv_create_size2, rwhv_commit_size2, wcv_commit_size2;
   observer.GetSizeForRenderViewHost(web_contents->GetRenderViewHost(),
                                     &rwhv_create_size2,
                                     &rwhv_commit_size2,
                                     &wcv_commit_size2);
   // The create height of RenderWidgetHostView should include the height inset.
   EXPECT_EQ(gfx::Size(initial_wcv_size.width(),
                       initial_wcv_size.height() + height_inset),
             rwhv_create_size2);
   // WebContentsView was resized in
   // RenderViewSizeObserver::NavigateToPendingEntry after RenderWidgetHostView
   // was created, so the commit size should be resized accordingly.
   gfx::Size exp_commit_size(initial_wcv_size);
   exp_commit_size.Enlarge(wcv_resize_insets.width(),
                           wcv_resize_insets.height() + height_inset);
   EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
   EXPECT_EQ(exp_commit_size, wcv_commit_size2);
   // Sizes of RenderWidgetHostView and WebContentsView before and after
   // WebContentsDelegate::DidNavigateMainFramePostCommit should be the same.
   EXPECT_EQ(rwhv_commit_size2,
             web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
   EXPECT_EQ(wcv_commit_size2, web_contents->GetView()->GetContainerSize());
 }