Supervised Users Initiated Installs v2

chrome/browser/extensions/extension_service_test_with_install.cc

 // Copyright 2015 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_service_test_with_install.h"
 
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_creator.h"
@@ skipping 179 matching lines @@
   return VerifyCrxInstall(path, install_state, std::string());
 }
 
 const Extension* ExtensionServiceTestWithInstall::VerifyCrxInstall(
     const base::FilePath& path,
     InstallState install_state,
     const std::string& expected_old_name) {
   std::vector<base::string16> errors = GetErrors();
   const Extension* extension = nullptr;
   if (install_state != INSTALL_FAILED) {
-    if (install_state == INSTALL_NEW)
+    if (install_state == INSTALL_NEW || install_state == INSTALL_WITHOUT_LOAD)
       ++expected_extensions_count_;
 
     EXPECT_TRUE(installed_) << path.value();
     // If and only if INSTALL_UPDATED, it should have the is_update flag.
     EXPECT_EQ(install_state == INSTALL_UPDATED, was_update_)
         << path.value();
     // If INSTALL_UPDATED, old_name_ should match the given string.
     if (install_state == INSTALL_UPDATED && !expected_old_name.empty())
       EXPECT_EQ(expected_old_name, old_name_);
     EXPECT_EQ(0u, errors.size()) << path.value();
 
     if (install_state == INSTALL_WITHOUT_LOAD) {
       EXPECT_EQ(0u, loaded_.size()) << path.value();
+      extension = installed_;
     } else {
       EXPECT_EQ(1u, loaded_.size()) << path.value();
       size_t actual_extension_count =
           registry()->enabled_extensions().size() +
           registry()->disabled_extensions().size();
       EXPECT_EQ(expected_extensions_count_, actual_extension_count) <<
           path.value();
       extension = loaded_[0].get();
       EXPECT_TRUE(service()->GetExtensionById(extension->id(), false))
           << path.value();
@@ skipping 198 matching lines @@
   content::WindowedNotificationObserver observer(
       extensions::NOTIFICATION_CRX_INSTALLER_DONE,
       content::Source<extensions::CrxInstaller>(installer.get()));
 
   installer->InstallCrx(crx_path);
 
   observer.Wait();
 }
 
 }  // namespace extensions