Supervised Users Initiated Installs v2

chrome/browser/extensions/extension_service_test_with_install.cc

Index: chrome/browser/extensions/extension_service_test_with_install.cc
diff --git a/chrome/browser/extensions/extension_service_test_with_install.cc b/chrome/browser/extensions/extension_service_test_with_install.cc
index fda8c4ba9514794d3d743691ea354c13de45d68a..10242671309a99a1ba3ac6accd106a7a23e3297e 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.cc
+++ b/chrome/browser/extensions/extension_service_test_with_install.cc
@@ -197,9 +197,8 @@ const Extension* ExtensionServiceTestWithInstall::VerifyCrxInstall(
   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_)
@@ -211,6 +210,7 @@ const Extension* ExtensionServiceTestWithInstall::VerifyCrxInstall(
 
     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 =