kiosk: Ensure launching latest version.

- Add a install_immediately flag to ExternalProviderImpl;
- Set install_immediately flag to true for kiosk app provider
  so that updated app install is not delayed;
- Set auto acknowledge since kiosk should not show external
  install alert;

BUG=461419

Review URL: https://codereview.chromium.org/974713002

Cr-Commit-Position: refs/heads/master@{#319005}

chrome/browser/chromeos/customization/customization_document_unittest.cc

@@ -179,12 +179,13 @@ class MockExternalProviderVisitor
  public:
   MockExternalProviderVisitor() {}
 
-  MOCK_METHOD6(OnExternalExtensionFileFound,
+  MOCK_METHOD7(OnExternalExtensionFileFound,
                bool(const std::string&,
                     const base::Version*,
                     const base::FilePath&,
                     extensions::Manifest::Location,
                     int,
+                    bool,
                     bool));
   MOCK_METHOD6(OnExternalExtensionUpdateUrlFound,
                bool(const std::string&,
@@ -345,7 +346,7 @@ TEST_F(ServicesCustomizationDocumentTest, NoCustomizationIdInVpd) {
           extensions::Extension::FROM_WEBSTORE |
               extensions::Extension::WAS_INSTALLED_BY_DEFAULT));
 
-  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);
@@ -390,7 +391,7 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {
           extensions::Extension::FROM_WEBSTORE |
               extensions::Extension::WAS_INSTALLED_BY_DEFAULT));
 
-  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);
@@ -401,7 +402,7 @@ TEST_F(ServicesCustomizationDocumentTest, DefaultApps) {
   loader->StartLoading();
   Mock::VerifyAndClearExpectations(&visitor);
 
-  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(2);
@@ -440,7 +441,7 @@ TEST_F(ServicesCustomizationDocumentTest, CustomizationManifestNotFound) {
           extensions::Extension::FROM_WEBSTORE |
               extensions::Extension::WAS_INSTALLED_BY_DEFAULT));
 
-  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);
@@ -451,7 +452,7 @@ TEST_F(ServicesCustomizationDocumentTest, CustomizationManifestNotFound) {
   loader->StartLoading();
   Mock::VerifyAndClearExpectations(&visitor);
 
-  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);

chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc

@@ -68,12 +68,13 @@ class MockExternalPolicyProviderVisitor
   MockExternalPolicyProviderVisitor();
   virtual ~MockExternalPolicyProviderVisitor();
 
-  MOCK_METHOD6(OnExternalExtensionFileFound,
+  MOCK_METHOD7(OnExternalExtensionFileFound,
                bool(const std::string&,
                     const base::Version*,
                     const base::FilePath&,
                     extensions::Manifest::Location,
                     int,
+                    bool,
                     bool));
   MOCK_METHOD6(OnExternalExtensionUpdateUrlFound,
                bool(const std::string&,
@@ -165,7 +166,7 @@ void DeviceLocalAccountExternalPolicyLoaderTest::TearDown() {
 void DeviceLocalAccountExternalPolicyLoaderTest::
     VerifyAndResetVisitorCallExpectations() {
   Mock::VerifyAndClearExpectations(&visitor_);
-  EXPECT_CALL(visitor_, OnExternalExtensionFileFound(_, _, _, _, _, _))
+  EXPECT_CALL(visitor_, OnExternalExtensionFileFound(_, _, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor_, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);
@@ -290,6 +291,7 @@ TEST_F(DeviceLocalAccountExternalPolicyLoaderTest, ForceInstallListSet) {
       cached_crx_path,
       extensions::Manifest::EXTERNAL_POLICY,
       _,
+      _,
       _));
   EXPECT_CALL(visitor_, OnExternalProviderReady(provider_.get()))
       .Times(1)

chrome/browser/extensions/extension_service.cc

@@ -2108,7 +2108,8 @@ bool ExtensionService::OnExternalExtensionFileFound(
          const base::FilePath& path,
          Manifest::Location location,
          int creation_flags,
-         bool mark_acknowledged) {
+         bool mark_acknowledged,
+         bool install_immediately) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(crx_file::id_util::IdIsValid(id));
   if (extension_prefs_->IsExternalExtensionUninstalled(id))
@@ -2159,6 +2160,7 @@ bool ExtensionService::OnExternalExtensionFileFound(
   installer->set_expected_id(id);
   installer->set_expected_version(*version);
   installer->set_install_cause(extension_misc::INSTALL_CAUSE_EXTERNAL_FILE);
+  installer->set_install_immediately(install_immediately);
   installer->set_creation_flags(creation_flags);
 #if defined(OS_CHROMEOS)
   extensions::InstallLimiter::Get(profile_)->Add(installer, path);

chrome/browser/extensions/extension_service.h

@@ -232,7 +232,8 @@ class ExtensionService
                                     const base::FilePath& path,
                                     extensions::Manifest::Location location,
                                     int creation_flags,
-                                    bool mark_acknowledged) override;
+                                    bool mark_acknowledged,
+                                    bool install_immediately) override;
   bool OnExternalExtensionUpdateUrlFound(
       const std::string& id,
       const std::string& install_parameter,

chrome/browser/extensions/external_policy_loader_unittest.cc

@@ -74,7 +74,8 @@ class MockExternalPolicyProviderVisitor
                                     const base::FilePath& path,
                                     Manifest::Location unused,
                                     int unused2,
-                                    bool unused3) override {
+                                    bool unused3,
+                                    bool unused4) override {
     ADD_FAILURE() << "There should be no external extensions from files.";
     return false;
   }

chrome/browser/extensions/external_provider_impl.cc

@@ -80,7 +80,8 @@ ExternalProviderImpl::ExternalProviderImpl(
       loader_(loader),
       profile_(profile),
       creation_flags_(creation_flags),
-      auto_acknowledge_(false) {
+      auto_acknowledge_(false),
+      install_immediately_(false) {
   loader_->Init(this);
 }
 
@@ -271,7 +272,8 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) {
       }
       service_->OnExternalExtensionFileFound(extension_id, &version, path,
                                              crx_location_, creation_flags,
-                                             auto_acknowledge_);
+                                             auto_acknowledge_,
+                                             install_immediately_);
     } else {  // if (has_external_update_url)
       CHECK(has_external_update_url);  // Checking of keys above ensures this.
       if (download_location_ == Manifest::INVALID_LOCATION) {
@@ -423,13 +425,15 @@ void ExternalProviderImpl::CreateExternalProviders(
         chromeos::KioskAppManager::Get();
     DCHECK(kiosk_app_manager);
     if (kiosk_app_manager && !kiosk_app_manager->external_loader_created()) {
-      provider_list->push_back(linked_ptr<ExternalProviderInterface>(
-          new ExternalProviderImpl(service,
-                                   kiosk_app_manager->CreateExternalLoader(),
-                                   profile,
-                                   Manifest::EXTERNAL_PREF,
-                                   Manifest::INVALID_LOCATION,
-                                   Extension::NO_FLAGS)));
+      scoped_ptr<ExternalProviderImpl> kiosk_app_provider(
+          new ExternalProviderImpl(
+              service, kiosk_app_manager->CreateExternalLoader(), profile,
+              Manifest::EXTERNAL_PREF, Manifest::INVALID_LOCATION,
+              Extension::NO_FLAGS));
+      kiosk_app_provider->set_auto_acknowledge(true);
+      kiosk_app_provider->set_install_immediately(true);
+      provider_list->push_back(
+          linked_ptr<ExternalProviderInterface>(kiosk_app_provider.release()));
     }
 #endif
     return;

chrome/browser/extensions/external_provider_impl.h

@@ -78,6 +78,10 @@ class ExternalProviderImpl : public ExternalProviderInterface {
     auto_acknowledge_ = auto_acknowledge;
   }
 
+  void set_install_immediately(bool install_immediately) {
+    install_immediately_ = install_immediately;
+  }
+
  private:
   // Location for external extensions that are provided by this provider from
   // local crx files.
@@ -113,6 +117,9 @@ class ExternalProviderImpl : public ExternalProviderInterface {
   // the user doesn't see an alert about them.
   bool auto_acknowledge_;
 
+  // Whether the extensions from this provider should be installed immediately.
+  bool install_immediately_;
+
   DISALLOW_COPY_AND_ASSIGN(ExternalProviderImpl);
 };
 

extensions/browser/external_provider_interface.h

@@ -40,7 +40,8 @@ class ExternalProviderInterface {
         const base::FilePath& path,
         Manifest::Location location,
         int creation_flags,
-        bool mark_acknowledged) = 0;
+        bool mark_acknowledged,
+        bool install_immediately) = 0;
 
     // Return true if the extension install will proceed.  Install might not
     // proceed if the extension is already installed from a higher priority