Reland 137540 - Disable off-store extension installs by default. Also get rid of ExtensionService::…

chrome/browser/extensions/extension_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/extension_webstore_private_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 385 matching lines @@
 
   // Matches the AddRef in RunImpl().
   Release();
 }
 
 void BeginInstallWithManifestFunction::InstallUIProceed() {
   // This gets cleared in CrxInstaller::ConfirmInstall(). TODO(asargent) - in
   // the future we may also want to add time-based expiration, where a whitelist
   // entry is only valid for some number of minutes.
   scoped_ptr<WebstoreInstaller::Approval> approval(
-      new WebstoreInstaller::Approval);
-  approval->extension_id = id_;
-  approval->profile = profile();
-  approval->parsed_manifest.reset(parsed_manifest_.release());
+      WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
+          profile(), id_, parsed_manifest_.Pass()));
   approval->use_app_installed_bubble = use_app_installed_bubble_;
   g_pending_approvals.Get().PushApproval(approval.Pass());
 
   SetResult(ERROR_NONE);
   SendResponse(true);
 
   // The Permissions_Install histogram is recorded from the ExtensionService
   // for all extension installs, so we only need to record the web store
   // specific histogram here.
   ExtensionService::RecordPermissionMessagesHistogram(
@@ skipping 83 matching lines @@
 void SilentlyInstallFunction::OnWebstoreParseSuccess(
     const std::string& id,
     const SkBitmap& icon,
     base::DictionaryValue* parsed_manifest) {
   CHECK_EQ(id_, id);
 
   // This lets CrxInstaller bypass the permission confirmation UI for the
   // extension. The whitelist entry gets cleared in
   // CrxInstaller::ConfirmInstall.
   scoped_ptr<WebstoreInstaller::Approval> approval(
-      new WebstoreInstaller::Approval);
-  approval->extension_id = id_;
-  approval->parsed_manifest.reset(parsed_manifest);
-  approval->profile = profile();
-  approval->use_app_installed_bubble = false;
+      WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
+          profile(), id_, scoped_ptr<base::DictionaryValue>(parsed_manifest)));
   approval->skip_post_install_ui = true;
 
   scoped_refptr<WebstoreInstaller> installer = new WebstoreInstaller(
       profile(), this,
       &(dispatcher()->delegate()->GetAssociatedWebContents()->GetController()),
       id_, approval.Pass(), WebstoreInstaller::FLAG_NONE);
   installer->Start();
 }
 
 void SilentlyInstallFunction::OnWebstoreParseFailure(
@@ skipping 106 matching lines @@
     SendResponse(true);
   } else {
     // Matched with a Release in OnGpuInfoUpdate.
     AddRef();
 
     manager->AddObserver(this);
     manager->RequestCompleteGpuInfoIfNeeded();
   }
   return true;
 }