Introduce a stable set of errors for inline install

chrome/browser/extensions/webstore_standalone_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/webstore_standalone_installer.h"
 
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
@@ skipping 41 matching lines @@
   // Add a ref to keep this alive for WebstoreDataFetcher.
   // All code paths from here eventually lead to either CompleteInstall or
   // AbortInstall, which both release this ref.
   AddRef();
 
   if (!Extension::IdIsValid(id_)) {
     CompleteInstall(webstore_install::INVALID_ID, kInvalidWebstoreItemId);
     return;
   }
 
-  webstore_install::Result result = webstore_install::UNKNOWN_ERROR;
+  webstore_install::Result result = webstore_install::OTHER_ERROR;
   std::string error;
   if (!EnsureUniqueInstall(&result, &error)) {
     CompleteInstall(result, error);
     return;
   }
 
   // Use the requesting page as the referrer both since that is more correct
   // (it is the page that caused this request to happen) and so that we can
   // track top sites that trigger inline install requests.
   webstore_data_fetcher_.reset(new WebstoreDataFetcher(
@@ skipping 44 matching lines @@
   InitInstallData(&install_data);
   scoped_active_install_.reset(new ScopedActiveInstall(tracker, install_data));
   return true;
 }
 
 void WebstoreStandaloneInstaller::CompleteInstall(
     webstore_install::Result result,
     const std::string& error) {
   scoped_active_install_.reset();
   if (!callback_.is_null())
-    callback_.Run(result == webstore_install::SUCCESS, error);
+    callback_.Run(result == webstore_install::SUCCESS, error, result);
   Release();  // Matches the AddRef in BeginInstall.
 }
 
 void WebstoreStandaloneInstaller::ProceedWithInstallPrompt() {
   install_prompt_ = CreateInstallPrompt();
   if (install_prompt_) {
     ShowInstallUI();
     // Control flow finishes up in InstallUIProceed or InstallUIAbort.
   } else {
     InstallUIProceed();
@@ skipping 161 matching lines @@
   manifest_.reset(manifest);
   icon_ = icon;
 
   OnManifestParsed();
 }
 
 void WebstoreStandaloneInstaller::OnWebstoreParseFailure(
     const std::string& id,
     InstallHelperResultCode result_code,
     const std::string& error_message) {
-  webstore_install::Result install_result = webstore_install::UNKNOWN_ERROR;
+  webstore_install::Result install_result = webstore_install::OTHER_ERROR;
   switch (result_code) {
     case WebstoreInstallHelper::Delegate::MANIFEST_ERROR:
       install_result = webstore_install::INVALID_MANIFEST;
       break;
     case WebstoreInstallHelper::Delegate::ICON_ERROR:
       install_result = webstore_install::ICON_ERROR;
       break;
     default:
       break;
   }
@@ skipping 73 matching lines @@
   CHECK_EQ(id_, id);
   CompleteInstall(webstore_install::SUCCESS, std::string());
 }
 
 void WebstoreStandaloneInstaller::OnExtensionInstallFailure(
     const std::string& id,
     const std::string& error,
     WebstoreInstaller::FailureReason reason) {
   CHECK_EQ(id_, id);
 
-  webstore_install::Result install_result = webstore_install::UNKNOWN_ERROR;
+  webstore_install::Result install_result = webstore_install::OTHER_ERROR;
   switch (reason) {
     case WebstoreInstaller::FAILURE_REASON_CANCELLED:
       install_result = webstore_install::USER_CANCELLED;
       break;
     case WebstoreInstaller::FAILURE_REASON_DEPENDENCY_NOT_FOUND:
     case WebstoreInstaller::FAILURE_REASON_DEPENDENCY_NOT_SHARED_MODULE:
       install_result = webstore_install::MISSING_DEPENDENCIES;
       break;
     default:
       break;
@@ skipping 17 matching lines @@
 void WebstoreStandaloneInstaller::OnWebStoreDataFetcherDone() {
   // An instance of this class is passed in as a delegate for the
   // WebstoreInstallHelper, ExtensionInstallPrompt and WebstoreInstaller, and
   // therefore needs to remain alive until they are done. Clear the webstore
   // data fetcher to avoid calling Release in AbortInstall while any of these
   // operations are in progress.
   webstore_data_fetcher_.reset();
 }
 
 }  // namespace extensions