Update defaults for InstantExtended.

chrome/browser/extensions/extension_install_ui_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 "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 124 matching lines @@
   ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();
   ASSERT_FALSE(GetTheme());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
                        TestInstallThemeInFullScreen) {
   EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_FULLSCREEN));
   InstallThemeAndVerify("theme", "camo theme");
 }
 
+// TODO(samarth): remove along with NTP4 code.
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
-                       AppInstallConfirmation) {
+                       DISABLED_AppInstallConfirmation) {
   int num_tabs = browser()->tab_strip_model()->count();
 
   base::FilePath app_dir = test_data_dir_.AppendASCII("app");
   ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(app_dir, 1, browser()));
 
   if (NewTabUI::ShouldShowApps()) {
     EXPECT_EQ(num_tabs + 1, browser()->tab_strip_model()->count());
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);
     EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(),
                                 "chrome://newtab/", false));
   } else {
     // TODO(xiyuan): Figure out how to test extension installed bubble?
   }
 }
 
+// TODO(samarth): remove along with NTP4 code.
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
-                       AppInstallConfirmation_Incognito) {
+                       DISABLED_AppInstallConfirmation_Incognito) {
   Browser* incognito_browser = CreateIncognitoBrowser();
 
   int num_incognito_tabs = incognito_browser->tab_strip_model()->count();
   int num_normal_tabs = browser()->tab_strip_model()->count();
 
   base::FilePath app_dir = test_data_dir_.AppendASCII("app");
   ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(app_dir, 1,
                                                 incognito_browser));
 
   EXPECT_EQ(num_incognito_tabs,
@@ skipping 28 matching lines @@
   }
 
  protected:
   std::string last_reordered_extension_id_;
   content::NotificationRegistrar registrar_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewTabUISortingBrowserTest);
 };
 
-#if defined(OS_WIN)
-#define MAYBE_ReorderDuringInstall DISABLED_ReorderDuringInstall
-#else
-#define MAYBE_ReorderDuringInstall ReorderDuringInstall
-#endif
-IN_PROC_BROWSER_TEST_F(NewTabUISortingBrowserTest, MAYBE_ReorderDuringInstall) {
+// TODO(samarth): remove along with NTP4 code.
+IN_PROC_BROWSER_TEST_F(NewTabUISortingBrowserTest,
+                       DISABLED_ReorderDuringInstall) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   ExtensionService* service = extensions::ExtensionSystem::Get(
       browser()->profile())->extension_service();
   base::FilePath app_dir = test_data_dir_.AppendASCII("app");
   const std::string app_id = extensions::id_util::GenerateIdForPath(app_dir);
 
   const extensions::Extension* webstore_extension =
       service->GetInstalledExtension(extension_misc::kWebStoreAppId);
   EXPECT_TRUE(webstore_extension);
   ExtensionSorting* sorting = service->extension_prefs()->extension_sorting();
@@ skipping 10 matching lines @@
                             std::string(),
                             extension_misc::kWebStoreAppId);
   EXPECT_EQ(app_id, last_reordered_extension_id_);
 
   // Now install the app.
   const extensions::Extension* test_app = LoadExtension(app_dir);
   ASSERT_TRUE(test_app);
   EXPECT_TRUE(service->GetInstalledExtension(app_id));
   EXPECT_EQ(app_id, test_app->id());
 }