Exclude hosted apps from post-sideload UI.

BUG=168243


Review URL: https://chromiumcodereview.appspot.com/11741035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175200 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_service.cc

@@ -2996,8 +2996,10 @@ bool ExtensionService::ShouldEnableOnInstall(const Extension* extension) {
 
   if (FeatureSwitch::prompt_for_external_extensions()->IsEnabled()) {
     // External extensions are initially disabled. We prompt the user before
-    // enabling them.
-    if (Extension::IsExternalLocation(extension->location()) &&
+    // enabling them. Hosted apps are excepted because they are not dangerous
+    // (they need to be launched by the user anyway).
+    if (extension->GetType() != Extension::TYPE_HOSTED_APP &&
+        Extension::IsExternalLocation(extension->location()) &&
         !extension_prefs_->IsExternalExtensionAcknowledged(extension->id())) {
       return false;
     }

chrome/browser/extensions/extension_service_unittest.cc

@@ -5717,14 +5717,12 @@ TEST_F(ExtensionServiceTest, ExternalInstallGlobalError) {
   EXPECT_FALSE(extensions::HasExternalInstallError(service_));
 
   // A hosted app, installed externally.
-  // This SHOULD trigger an alert.
+  // This should NOT trigger an alert.
   provider->UpdateOrAddExtension(hosted_app, "1.0.0.0",
                                  data_dir_.AppendASCII("hosted_app.crx"));
 
   service_->CheckForExternalUpdates();
   loop_.RunUntilIdle();
-  EXPECT_TRUE(extensions::HasExternalInstallError(service_));
-  service_->EnableExtension(hosted_app);
   EXPECT_FALSE(extensions::HasExternalInstallError(service_));
 
   // Another normal extension, but installed externally.