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

chrome/browser/extensions/crx_installer_browsertest.cc

Index: chrome/browser/extensions/crx_installer_browsertest.cc
===================================================================
--- chrome/browser/extensions/crx_installer_browsertest.cc	(revision 137574)
+++ chrome/browser/extensions/crx_installer_browsertest.cc	(working copy)
@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_file_util.h"
-#include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 class SkBitmap;
@@ -68,10 +67,10 @@
       return false;
 
     scoped_ptr<WebstoreInstaller::Approval> approval(
-        WebstoreInstaller::Approval::CreateWithNoInstallPrompt(
-            browser()->profile(),
-            id,
-            scoped_ptr<base::DictionaryValue>(parsed_manifest)));
+        new WebstoreInstaller::Approval);
+    approval->extension_id = id;
+    approval->profile = browser()->profile();
+    approval->parsed_manifest.reset(parsed_manifest);
 
     scoped_refptr<CrxInstaller> installer(
         CrxInstaller::Create(service,
@@ -125,9 +124,6 @@
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, PackAndInstallExtension) {
-  if (!extensions::switch_utils::IsOffStoreInstallEnabled())
-    return;
-
   const int kNumDownloadsExpected = 1;
   const bool kExpectFileSelectDialog = false;