Move application creation and extension install prompt showing off Browser and onto ExtensionTabHel…

chrome/browser/extensions/crx_installer_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 "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_test_observer.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class SkBitmap;
 
 using extensions::Extension;
 
 namespace {
 
 // Observer waits for exactly one download to finish.
 
 class MockInstallPrompt : public ExtensionInstallPrompt {
  public:
-  explicit MockInstallPrompt(Browser* browser) :
-      ExtensionInstallPrompt(browser),
+  explicit MockInstallPrompt(gfx::NativeWindow parent,
+                             content::PageNavigator* navigator,
+                             Profile* profile) :
+      ExtensionInstallPrompt(parent, navigator, profile),
       confirmation_requested_(false),
       extension_(NULL) {}
 
   bool did_succeed() const { return !!extension_; }
   const Extension* extension() const { return extension_; }
   bool confirmation_requested() const { return confirmation_requested_; }
   const string16& error() const { return error_; }
   void set_record_oauth2_grant(bool record) { record_oauth2_grant_ = record; }
 
   // Overriding some of the ExtensionInstallUI API.
@@ skipping 11 matching lines @@
     error_ = error.message();
     MessageLoopForUI::current()->Quit();
   }
 
  private:
   bool confirmation_requested_;
   string16 error_;
   const Extension* extension_;
 };
 
+MockInstallPrompt* CreateMockInstallPromptForBrowser(Browser* browser) {
+  gfx::NativeWindow parent =
+      browser->window() ? browser->window()->GetNativeWindow() : NULL;
+  return new MockInstallPrompt(parent, browser, browser->profile());
+}
+
 }  // namespace
 
 class ExtensionCrxInstallerTest : public ExtensionBrowserTest {
  public:
   // Installs a crx from |crx_relpath| (a path relative to the extension test
   // data dir) with expected id |id|. Returns the installer.
   scoped_refptr<CrxInstaller> InstallWithPrompt(
       const std::string& ext_relpath,
       const std::string& id,
       MockInstallPrompt* mock_install_prompt) {
@@ skipping 29 matching lines @@
 
   // Installs an extension and checks that it has scopes granted IFF
   // |record_oauth2_grant| is true.
   void CheckHasEmptyScopesAfterInstall(const std::string& ext_relpath,
                                        bool record_oauth2_grant) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExperimentalExtensionApis);
 
     ExtensionService* service = browser()->profile()->GetExtensionService();
 
-    MockInstallPrompt* mock_prompt = new MockInstallPrompt(browser());
+    MockInstallPrompt* mock_prompt =
+        CreateMockInstallPromptForBrowser(browser());
     mock_prompt->set_record_oauth2_grant(record_oauth2_grant);
     scoped_refptr<CrxInstaller> installer =
         InstallWithPrompt("browsertest/scopes", std::string(), mock_prompt);
 
     scoped_refptr<extensions::PermissionSet> permissions =
         service->extension_prefs()->GetGrantedPermissions(
             mock_prompt->extension()->id());
     ASSERT_TRUE(permissions.get());
     EXPECT_NE(record_oauth2_grant, permissions->scopes().empty());
   }
 };
 
 #if defined(OS_CHROMEOS)
 #define MAYBE_Whitelisting DISABLED_Whitelisting
 #else
 #define MAYBE_Whitelisting Whitelisting
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, MAYBE_Whitelisting) {
   std::string id = "hdgllgikmikobbofgnabhfimcfoopgnd";
   ExtensionService* service = browser()->profile()->GetExtensionService();
 
   // Even whitelisted extensions with NPAPI should not prompt.
-  MockInstallPrompt* mock_prompt = new MockInstallPrompt(browser());
+  MockInstallPrompt* mock_prompt =
+      CreateMockInstallPromptForBrowser(browser());
   scoped_refptr<CrxInstaller> installer =
       InstallWithPrompt("uitest/plugins", id, mock_prompt);
   EXPECT_FALSE(mock_prompt->confirmation_requested());
   EXPECT_TRUE(service->GetExtensionById(id, false));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest,
                        GalleryInstallGetsExperimental) {
   // We must modify the command line temporarily in order to pack an extension
   // that requests the experimental permission.
@@ skipping 26 matching lines @@
   const int kNumDownloadsExpected = 1;
   const bool kExpectFileSelectDialog = false;
 
   LOG(ERROR) << "PackAndInstallExtension: Packing extension";
   FilePath crx_path = PackExtension(
       test_data_dir_.AppendASCII("common/background_page"));
   ASSERT_FALSE(crx_path.empty());
   std::string crx_path_string(crx_path.value().begin(), crx_path.value().end());
   GURL url = GURL(std::string("file:///").append(crx_path_string));
 
-  MockInstallPrompt* mock_prompt = new MockInstallPrompt(browser());
+  MockInstallPrompt* mock_prompt =
+      CreateMockInstallPromptForBrowser(browser());
   download_crx_util::SetMockInstallPromptForTesting(mock_prompt);
 
   LOG(ERROR) << "PackAndInstallExtension: Getting download manager";
   content::DownloadManager* download_manager =
       content::BrowserContext::GetDownloadManager(browser()->profile());
 
   LOG(ERROR) << "PackAndInstallExtension: Setting observer";
   scoped_ptr<DownloadTestObserver> observer(
       new DownloadTestObserverTerminal(
           download_manager, kNumDownloadsExpected, kExpectFileSelectDialog,
@@ skipping 24 matching lines @@
 #if defined(USE_AURA)
 #define MAYBE_AllowOffStore DISABLED_AllowOffStore
 #else
 #define MAYBE_AllowOffStore AllowOffStore
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, MAYBE_AllowOffStore) {
   ExtensionService* service = browser()->profile()->GetExtensionService();
   const bool kTestData[] = {false, true};
 
   for (size_t i = 0; i < arraysize(kTestData); ++i) {
-    MockInstallPrompt* mock_prompt = new MockInstallPrompt(browser());
+    MockInstallPrompt* mock_prompt =
+        CreateMockInstallPromptForBrowser(browser());
     scoped_refptr<CrxInstaller> crx_installer(
         CrxInstaller::Create(service, mock_prompt));
     crx_installer->set_install_cause(
         extension_misc::INSTALL_CAUSE_USER_DOWNLOAD);
 
     if (kTestData[i]) {
       crx_installer->set_off_store_install_allow_reason(
           CrxInstaller::OffStoreInstallAllowedInTest);
     }
 
     crx_installer->InstallCrx(test_data_dir_.AppendASCII("good.crx"));
     EXPECT_EQ(kTestData[i], WaitForExtensionInstall()) << kTestData[i];
     EXPECT_EQ(kTestData[i], mock_prompt->did_succeed());
     EXPECT_EQ(kTestData[i], mock_prompt->confirmation_requested()) <<
         kTestData[i];
     if (kTestData[i]) {
       EXPECT_EQ(string16(), mock_prompt->error()) << kTestData[i];
     } else {
       EXPECT_EQ(l10n_util::GetStringUTF16(
           IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE),
           mock_prompt->error()) << kTestData[i];
     }
   }
 }