Optimize promotion of ephemeral apps

chrome/browser/extensions/api/webstore_private/webstore_private_api.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/api/webstore_private/webstore_private_api.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 23 matching lines @@
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
@@ skipping 503 matching lines @@
 
   approval_ = g_pending_approvals.Get()
                   .PopApproval(GetProfile(), params->expected_id)
                   .Pass();
   if (!approval_) {
     error_ = ErrorUtils::FormatErrorMessage(
         kNoPreviousBeginInstallWithManifestError, params->expected_id);
     return false;
   }
 
-  // Balanced in OnExtensionInstallSuccess() or OnExtensionInstallFailure().
-  AddRef();
   AppListService* app_list_service =
       AppListService::Get(GetCurrentBrowser()->host_desktop_type());
 
   if (approval_->enable_launcher) {
     app_list_service->EnableAppList(GetProfile(),
                                     AppListService::ENABLE_FOR_APP_INSTALL);
   }
 
   if (IsAppLauncherEnabled() && approval_->manifest->is_app()) {
     // Show the app list to show download is progressing. Don't show the app
     // list on first app install so users can be trained to open it themselves.
     if (approval_->enable_launcher)
       app_list_service->CreateForProfile(GetProfile());
     else
       app_list_service->AutoShowForProfile(GetProfile());
   }
 
+  // If the target extension has already been installed ephemerally, it can
+  // be promoted to a regular installed extension and downloading from the Web
+  // Store is not necessary.
+  const Extension* extension = ExtensionRegistry::Get(GetProfile())->
+      GetExtensionById(params->expected_id, ExtensionRegistry::EVERYTHING);
+  if (extension && util::IsEphemeralApp(extension->id(), GetProfile())) {
+    ExtensionService* extension_service =
+        ExtensionSystem::Get(GetProfile())->extension_service();
+    extension_service->InstallEphemeralApp(extension, true);
+    OnInstallSuccess(extension->id());
+    return true;
+  }
+
+  // Balanced in OnExtensionInstallSuccess() or OnExtensionInstallFailure().
+  AddRef();
+
   // The extension will install through the normal extension install flow, but
   // the whitelist entry will bypass the normal permissions install dialog.
   scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
       GetProfile(),
       this,
       dispatcher()->delegate()->GetAssociatedWebContents(),
       params->expected_id,
       approval_.Pass(),
       WebstoreInstaller::INSTALL_SOURCE_OTHER);
   installer->Start();
 
   return true;
 }
 
 void WebstorePrivateCompleteInstallFunction::OnExtensionInstallSuccess(
     const std::string& id) {
-  if (test_webstore_installer_delegate)
-    test_webstore_installer_delegate->OnExtensionInstallSuccess(id);
-
-  VLOG(1) << "Install success, sending response";
-  g_pending_installs.Get().EraseInstall(GetProfile(), id);
-  SendResponse(true);
-
+  OnInstallSuccess(id);
   RecordWebstoreExtensionInstallResult(true);
 
   // Matches the AddRef in RunAsync().
   Release();
 }
 
 void WebstorePrivateCompleteInstallFunction::OnExtensionInstallFailure(
     const std::string& id,
     const std::string& error,
     WebstoreInstaller::FailureReason reason) {
   if (test_webstore_installer_delegate) {
     test_webstore_installer_delegate->OnExtensionInstallFailure(
         id, error, reason);
   }
 
   error_ = error;
   VLOG(1) << "Install failed, sending response";
   g_pending_installs.Get().EraseInstall(GetProfile(), id);
   SendResponse(false);
 
   RecordWebstoreExtensionInstallResult(false);
 
   // Matches the AddRef in RunAsync().
   Release();
 }
 
+void WebstorePrivateCompleteInstallFunction::OnInstallSuccess(
+    const std::string& id) {
+  if (test_webstore_installer_delegate)
+    test_webstore_installer_delegate->OnExtensionInstallSuccess(id);
+
+  VLOG(1) << "Install success, sending response";
+  g_pending_installs.Get().EraseInstall(GetProfile(), id);
+  SendResponse(true);
+}
+
 WebstorePrivateEnableAppLauncherFunction::
     WebstorePrivateEnableAppLauncherFunction() {}
 
 WebstorePrivateEnableAppLauncherFunction::
     ~WebstorePrivateEnableAppLauncherFunction() {}
 
 bool WebstorePrivateEnableAppLauncherFunction::RunSync() {
   AppListService::Get(GetCurrentBrowser()->host_desktop_type())
       ->EnableAppList(GetProfile(), AppListService::ENABLE_VIA_WEBSTORE_LINK);
   return true;
@@ skipping 148 matching lines @@
   } else {
     error_ = "merge_session_failed";
     SendResponse(false);
   }
 
   SigninManagerFactory::GetInstance()->RemoveObserver(this);
   Release();  // Balanced in RunAsync().
 }
 
 }  // namespace extensions