Merge 142921 - Use an infobar instead of alert box for extension install

chrome/browser/extensions/crx_installer.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/extensions/crx_installer.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 154 matching lines @@
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&CrxInstaller::ConvertUserScriptOnFileThread, this)))
     NOTREACHED();
 }
 
 void CrxInstaller::ConvertUserScriptOnFileThread() {
   string16 error;
   scoped_refptr<Extension> extension =
       ConvertUserScriptToExtension(source_file_, download_url_, &error);
   if (!extension) {
-    ReportFailureFromFileThread(error);
+    ReportFailureFromFileThread(CrxInstallerError(error));
     return;
   }
 
   OnUnpackSuccess(extension->path(), extension->path(), NULL, extension);
 }
 
 void CrxInstaller::InstallWebApp(const WebApplicationInfo& web_app) {
   if (!BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&CrxInstaller::ConvertWebAppOnFileThread, this, web_app)))
     NOTREACHED();
 }
 
 void CrxInstaller::ConvertWebAppOnFileThread(
     const WebApplicationInfo& web_app) {
   string16 error;
   scoped_refptr<Extension> extension(
       ConvertWebAppToExtension(web_app, base::Time::Now()));
   if (!extension) {
     // Validation should have stopped any potential errors before getting here.
     NOTREACHED() << "Could not convert web app to extension.";
     return;
   }
 
   // TODO(aa): conversion data gets lost here :(
 
   OnUnpackSuccess(extension->path(), extension->path(), NULL, extension);
 }
 
-bool CrxInstaller::AllowInstall(const Extension* extension,
-                                string16* error) {
+CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  DCHECK(error);
 
   // Make sure the expected ID matches if one was supplied or if we want to
   // bypass the prompt.
   if ((approved_ || !expected_id_.empty()) &&
       expected_id_ != extension->id()) {
-    *error = l10n_util::GetStringFUTF16(IDS_EXTENSION_INSTALL_UNEXPECTED_ID,
-                                        ASCIIToUTF16(expected_id_),
-                                        ASCIIToUTF16(extension->id()));
-    return false;
+    return CrxInstallerError(
+        l10n_util::GetStringFUTF16(IDS_EXTENSION_INSTALL_UNEXPECTED_ID,
+                                   ASCIIToUTF16(expected_id_),
+                                   ASCIIToUTF16(extension->id())));
   }
 
   if (expected_version_.get() &&
       !expected_version_->Equals(*extension->version())) {
-    *error = l10n_util::GetStringFUTF16(
-        IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION,
-        ASCIIToUTF16(expected_version_->GetString()),
-        ASCIIToUTF16(extension->version()->GetString()));
-    return false;
+    return CrxInstallerError(
+        l10n_util::GetStringFUTF16(
+            IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION,
+            ASCIIToUTF16(expected_version_->GetString()),
+            ASCIIToUTF16(extension->version()->GetString())));
   }
 
   // Make sure the manifests match if we want to bypass the prompt.
   if (approved_ &&
       (!expected_manifest_.get() ||
        !expected_manifest_->Equals(original_manifest_.get()))) {
-    *error = l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID);
-    return false;
+    return CrxInstallerError(
+        l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID));
   }
 
   // The checks below are skipped for themes and external installs.
   // TODO(pamg): After ManagementPolicy refactoring is complete, remove this
   // and other uses of install_source_ that are no longer needed now that the
   // SandboxedExtensionUnpacker sets extension->location.
   if (extension->is_theme() || Extension::IsExternalLocation(install_source_))
-    return true;
+    return CrxInstallerError();
 
   if (!extensions_enabled_) {
-    *error = l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_NOT_ENABLED);
-    return false;
+    return CrxInstallerError(
+        l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_NOT_ENABLED));
   }
 
   if (install_cause_ == extension_misc::INSTALL_CAUSE_USER_DOWNLOAD) {
     if (extensions::switch_utils::IsEasyOffStoreInstallEnabled()) {
       const char* kHistogramName = "Extensions.OffStoreInstallDecisionEasy";
       if (is_gallery_install()) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
                                   NumOffStoreInstallDecision);
       } else {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OffStoreInstallAllowed,
                                   NumOffStoreInstallDecision);
       }
     } else {
       const char* kHistogramName = "Extensions.OffStoreInstallDecisionHard";
       if (is_gallery_install()) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OnStoreInstall,
                                   NumOffStoreInstallDecision);
       } else if (off_store_install_allow_reason_ != OffStoreInstallDisallowed) {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OffStoreInstallAllowed,
                                   NumOffStoreInstallDecision);
         UMA_HISTOGRAM_ENUMERATION("Extensions.OffStoreInstallAllowReason",
                                   off_store_install_allow_reason_,
                                   NumOffStoreInstallAllowReasons);
       } else {
         UMA_HISTOGRAM_ENUMERATION(kHistogramName, OffStoreInstallDisallowed,
                                   NumOffStoreInstallDecision);
-        *error = l10n_util::GetStringUTF16(
-            IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE);
         // Don't delete source in this case so that the user can install
         // manually if they want.
         delete_source_ = false;
         did_handle_successfully_ = false;
-        return false;
+
+        return CrxInstallerError(
+            CrxInstallerError::ERROR_OFF_STORE,
+            l10n_util::GetStringUTF16(
+                IDS_EXTENSION_INSTALL_DISALLOWED_ON_SITE));
       }
     }
   }
 
   if (extension_->is_app()) {
     // If the app was downloaded, apps_require_extension_mime_type_
     // will be set.  In this case, check that it was served with the
     // right mime type.  Make an exception for file URLs, which come
     // from the users computer and have no headers.
     if (!download_url_.SchemeIsFile() &&
         apps_require_extension_mime_type_ &&
         original_mime_type_ != Extension::kMimeType) {
-      *error = l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_INSTALL_INCORRECT_APP_CONTENT_TYPE,
-          ASCIIToUTF16(Extension::kMimeType));
-      return false;
+      return CrxInstallerError(
+          l10n_util::GetStringFUTF16(
+              IDS_EXTENSION_INSTALL_INCORRECT_APP_CONTENT_TYPE,
+              ASCIIToUTF16(Extension::kMimeType)));
     }
 
     // If the client_ is NULL, then the app is either being installed via
     // an internal mechanism like sync, external_extensions, or default apps.
     // In that case, we don't want to enforce things like the install origin.
     if (!is_gallery_install() && client_) {
       // For apps with a gallery update URL, require that they be installed
       // from the gallery.
       // TODO(erikkay) Apply this rule for paid extensions and themes as well.
       if (extension->UpdatesFromGallery()) {
-        *error = l10n_util::GetStringFUTF16(
-            IDS_EXTENSION_DISALLOW_NON_DOWNLOADED_GALLERY_INSTALLS,
-            l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE));
-        return false;
+        return CrxInstallerError(
+            l10n_util::GetStringFUTF16(
+                IDS_EXTENSION_DISALLOW_NON_DOWNLOADED_GALLERY_INSTALLS,
+                l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));
       }
 
       // For self-hosted apps, verify that the entire extent is on the same
       // host (or a subdomain of the host) the download happened from.  There's
       // no way for us to verify that the app controls any other hosts.
       URLPattern pattern(UserScript::kValidUserScriptSchemes);
       pattern.SetHost(download_url_.host());
       pattern.SetMatchSubdomains(true);
 
       URLPatternSet patterns = extension_->web_extent();
       for (URLPatternSet::const_iterator i = patterns.begin();
            i != patterns.end(); ++i) {
         if (!pattern.MatchesHost(i->host())) {
-          *error = l10n_util::GetStringUTF16(
-              IDS_EXTENSION_INSTALL_INCORRECT_INSTALL_HOST);
-          return false;
+          return CrxInstallerError(
+              l10n_util::GetStringUTF16(
+                  IDS_EXTENSION_INSTALL_INCORRECT_INSTALL_HOST));
         }
       }
     }
   }
 
-  return true;
+  return CrxInstallerError();
 }
 
 void CrxInstaller::OnUnpackFailure(const string16& error_message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackFailureInstallSource",
                             install_source(), Extension::NUM_LOCATIONS);
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackFailureInstallCause",
                             install_cause(),
                             extension_misc::NUM_INSTALL_CAUSES);
 
-  ReportFailureFromFileThread(error_message);
+  ReportFailureFromFileThread(CrxInstallerError(error_message));
 }
 
 void CrxInstaller::OnUnpackSuccess(const FilePath& temp_dir,
                                    const FilePath& extension_dir,
                                    const DictionaryValue* original_manifest,
                                    const Extension* extension) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackSuccessInstallSource",
                             install_source(), Extension::NUM_LOCATIONS);
 
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.UnpackSuccessInstallCause",
                             install_cause(),
                             extension_misc::NUM_INSTALL_CAUSES);
 
   // Note: We take ownership of |extension| and |temp_dir|.
   extension_ = extension;
   temp_dir_ = temp_dir;
 
   if (original_manifest)
     original_manifest_.reset(original_manifest->DeepCopy());
 
   // We don't have to delete the unpack dir explicity since it is a child of
   // the temp dir.
   unpacked_extension_root_ = extension_dir;
 
-  string16 error;
-  if (!AllowInstall(extension, &error)) {
+  CrxInstallerError error = AllowInstall(extension);
+  if (error.type() != CrxInstallerError::ERROR_NONE) {
     ReportFailureFromFileThread(error);
     return;
   }
 
   if (client_) {
     Extension::DecodeIcon(extension_.get(),
                           ExtensionIconSet::EXTENSION_ICON_LARGE,
                           ExtensionIconSet::MATCH_BIGGER,
                           &install_icon_);
   }
 
   if (!BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(&CrxInstaller::ConfirmInstall, this)))
     NOTREACHED();
 }
 
 void CrxInstaller::ConfirmInstall() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!frontend_weak_.get())
     return;
 
   if (frontend_weak_->extension_prefs()
       ->IsExtensionBlacklisted(extension_->id())) {
     VLOG(1) << "This extension: " << extension_->id()
             << " is blacklisted. Install failed.";
     ReportFailureFromUIThread(
-        l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_INSTALL_BLACKLISTED));
+        CrxInstallerError(
+            l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_INSTALL_BLACKLISTED)));
     return;
   }
 
   string16 error;
   if (!ExtensionSystem::Get(profile_)->management_policy()->UserMayLoad(
       extension_, &error)) {
-    ReportFailureFromUIThread(error);
+    ReportFailureFromUIThread(CrxInstallerError(error));
     return;
   }
 
   GURL overlapping_url;
   const Extension* overlapping_extension =
       frontend_weak_->extensions()->
       GetHostedAppByOverlappingWebExtent(extension_->web_extent());
   if (overlapping_extension &&
       overlapping_extension->id() != extension_->id()) {
-    ReportFailureFromUIThread(l10n_util::GetStringFUTF16(
-        IDS_EXTENSION_OVERLAPPING_WEB_EXTENT,
-        UTF8ToUTF16(overlapping_extension->name())));
+    ReportFailureFromUIThread(
+        CrxInstallerError(
+            l10n_util::GetStringFUTF16(
+                IDS_EXTENSION_OVERLAPPING_WEB_EXTENT,
+                UTF8ToUTF16(overlapping_extension->name()))));
     return;
   }
 
   current_version_ =
       frontend_weak_->extension_prefs()->GetVersionString(extension_->id());
 
   if (client_ && (!allow_silent_install_ || !approved_)) {
     AddRef();  // Balanced in Proceed() and Abort().
     client_->ConfirmInstall(this, extension_.get());
   } else {
@@ skipping 36 matching lines @@
 }
 
 void CrxInstaller::CompleteInstall() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!current_version_.empty()) {
     scoped_ptr<Version> current_version(
         Version::GetVersionFromString(current_version_));
     if (current_version->CompareTo(*(extension_->version())) > 0) {
       ReportFailureFromFileThread(
-          l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_DOWNGRADE_VERSION));
+          CrxInstallerError(
+              l10n_util::GetStringUTF16(IDS_EXTENSION_CANT_DOWNGRADE_VERSION)));
       return;
     }
   }
 
   // See how long extension install paths are.  This is important on
   // windows, because file operations may fail if the path to a file
   // exceeds a small constant.  See crbug.com/69693 .
   UMA_HISTOGRAM_CUSTOM_COUNTS(
     "Extensions.CrxInstallDirPathLength",
         install_directory_.value().length(), 0, 500, 100);
 
   FilePath version_dir = extension_file_util::InstallExtension(
       unpacked_extension_root_,
       extension_->id(),
       extension_->VersionString(),
       install_directory_);
   if (version_dir.empty()) {
     ReportFailureFromFileThread(
-        l10n_util::GetStringUTF16(
-            IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED));
+        CrxInstallerError(
+            l10n_util::GetStringUTF16(
+                IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED)));
     return;
   }
 
   // This is lame, but we must reload the extension because absolute paths
   // inside the content scripts are established inside InitFromValue() and we
   // just moved the extension.
   // TODO(aa): All paths to resources inside extensions should be created
   // lazily and based on the Extension's root path at that moment.
   // TODO(rdevlin.cronin): Continue removing std::string errors and replacing
   // with string16
   std::string error;
   extension_ = extension_file_util::LoadExtension(
       version_dir,
       install_source_,
       extension_->creation_flags() | Extension::REQUIRE_KEY,
       &error);
   CHECK(error.empty()) << error;
 
   ReportSuccessFromFileThread();
 }
 
-void CrxInstaller::ReportFailureFromFileThread(const string16& error) {
+void CrxInstaller::ReportFailureFromFileThread(const CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (!BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
-          base::Bind(&CrxInstaller::ReportFailureFromUIThread, this, error)))
+          base::Bind(&CrxInstaller::ReportFailureFromUIThread, this, error))) {
     NOTREACHED();
+  }
 }
 
-void CrxInstaller::ReportFailureFromUIThread(const string16& error) {
+void CrxInstaller::ReportFailureFromUIThread(const CrxInstallerError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                   content::Source<CrxInstaller>(this),
-                  content::Details<const string16>(&error));
+                  content::Details<const string16>(&error.message()));
 
   // This isn't really necessary, it is only used because unit tests expect to
   // see errors get reported via this interface.
   //
   // TODO(aa): Need to go through unit tests and clean them up too, probably get
   // rid of this line.
-  ExtensionErrorReporter::GetInstance()->ReportError(error, false);  // quiet
+  ExtensionErrorReporter::GetInstance()->ReportError(
+      error.message(), false);  // quiet
 
   if (client_)
     client_->OnInstallFailure(error);
 
   NotifyCrxInstallComplete(NULL);
 }
 
 void CrxInstaller::ReportSuccessFromFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
@@ skipping 53 matching lines @@
   // Some users (such as the download shelf) need to know when a
   // CRXInstaller is done.  Listening for the EXTENSION_* events
   // is problematic because they don't know anything about the
   // extension before it is unpacked, so they cannot filter based
   // on the extension.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<CrxInstaller>(this),
       content::Details<const Extension>(extension));
 }