Ensure that the AppListController class which lives in app_list_controller_win.cc plays nice with A…

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/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
@@ skipping 103 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");
 }
 
-// Disabled: http://crbug.com/174399
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_AppInstallConfirmation DISABLED_AppInstallConfirmation
-#define MAYBE_AppInstallConfirmation_Incognito DISABLED_AppInstallConfirmation_Incognito
-#else
-#define MAYBE_AppInstallConfirmation AppInstallConfirmation
-#define MAYBE_AppInstallConfirmation_Incognito AppInstallConfirmation_Incognito
-#endif
-
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
-                       MAYBE_AppInstallConfirmation) {
+                       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?
   }
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
-                       MAYBE_AppInstallConfirmation_Incognito) {
+                       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,
             incognito_browser->tab_strip_model()->count());
   if (NewTabUI::ShouldShowApps()) {
     EXPECT_EQ(num_normal_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?
   }
 }