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

chrome/browser/extensions/extension_webstore_private_api.cc

Index: chrome/browser/extensions/extension_webstore_private_api.cc
diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc
index b3efdd869348920731f4c6460f8b692d065ff747..f2d11354763c53807804b97fe372ca3d5d1a4622 100644
--- a/chrome/browser/extensions/extension_webstore_private_api.cc
+++ b/chrome/browser/extensions/extension_webstore_private_api.cc
@@ -403,10 +403,8 @@ void BeginInstallWithManifestFunction::InstallUIProceed() {
   // 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());
 
@@ -510,11 +508,8 @@ void SilentlyInstallFunction::OnWebstoreParseSuccess(
   // 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(