Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref

chrome/browser/extensions/extension_service_sync_unittest.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 <stddef.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 1666 matching lines @@
   std::string id = extension->id();
 
   // Now make the profile supervised.
   profile()->AsTestingProfile()->SetSupervisedUserId(
       supervised_users::kChildAccountSUID);
 
   // The extension should not be enabled anymore.
   EXPECT_FALSE(registry()->enabled_extensions().Contains(id));
 }
 
+TEST_F(ExtensionServiceTestSupervised,
+       DelegatedAndPreinstalledExtensionIsSUFirst) {
+  InitServices(false /* profile_is_supervised */);
+
+  // Install an extension.
+  base::FilePath path = data_dir().AppendASCII("good.crx");
+  const Extension* extension = InstallCRX(path, INSTALL_NEW);
+  std::string id = extension->id();
+  const std::string version("1.0.0.0");
+
+  // It should be enabled.
+  EXPECT_TRUE(registry()->enabled_extensions().Contains(id));
+
+  // Now make the profile supervised.
+  profile()->AsTestingProfile()->SetSupervisedUserId(
+      supervised_users::kChildAccountSUID);
+
+  // It should not be enabled now  (it is not loaded at all actually).
+  EXPECT_FALSE(registry()->enabled_extensions().Contains(id));
+
+  // Simulate data sync with the "was_installed_by_custodian" flag set to 1.
+  sync_pb::EntitySpecifics specifics;
+  sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
+  ext_specifics->set_id(id);
+  ext_specifics->set_enabled(true);
+  ext_specifics->set_disable_reasons(Extension::DISABLE_NONE);
+  ext_specifics->set_installed_by_custodian(true);
+  ext_specifics->set_version(version);
+
+  SyncChangeList list =
+      MakeSyncChangeList(id, specifics, SyncChange::ACTION_UPDATE);
+
+  extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
+
+  // The extension should be enabled again.
+  EXPECT_TRUE(registry()->enabled_extensions().Contains(id));

[Marc Treib, 2016/06/13 12:17:09]

This should probably be ASSERT_TRUE - if it's false, the next line would crash.

[mamir, 2016/06/13 14:15:57]

Done.

+  EXPECT_TRUE(registry()
+                  ->enabled_extensions()
+                  .GetByID(id)
+                  ->was_installed_by_custodian());

[Marc Treib, 2016/06/13 12:17:09]

Woah, did git cl format do this? Ugh... maybe pull up to "GetByID" out of the
EXPECT, so things will fit on a line? (Then you could also
ASSERT_TRUE(extension) to make sure it's not null, and leave the EXPECT above
be.)

[mamir, 2016/06/13 14:15:57]

Done.

+}
+
+TEST_F(ExtensionServiceTestSupervised,
+       DelegatedAndPreinstalledExtensionSyncFirst) {
+  InitServices(false /* profile_is_supervised */);
+
+  // Install an extension.
+  base::FilePath path = data_dir().AppendASCII("good.crx");
+  const Extension* extension = InstallCRX(path, INSTALL_NEW);
+  std::string id = extension->id();
+  const std::string version("1.0.0.0");
+
+  // It should be enabled.
+  EXPECT_TRUE(registry()->enabled_extensions().Contains(id));
+
+  // Simulate data sync with the "was_installed_by_custodian" flag set to 1.
+  sync_pb::EntitySpecifics specifics;
+  sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
+  ext_specifics->set_id(id);
+  ext_specifics->set_enabled(true);
+  ext_specifics->set_disable_reasons(Extension::DISABLE_NONE);
+  ext_specifics->set_installed_by_custodian(true);
+  ext_specifics->set_version(version);
+
+  SyncChangeList list =
+      MakeSyncChangeList(id, specifics, SyncChange::ACTION_UPDATE);
+
+  extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
+
+  // Now make the profile supervised.
+  profile()->AsTestingProfile()->SetSupervisedUserId(
+      supervised_users::kChildAccountSUID);
+
+  // The extension should be enabled.
+  EXPECT_TRUE(registry()->enabled_extensions().Contains(id));
+  EXPECT_TRUE(registry()
+                  ->enabled_extensions()
+                  .GetByID(id)
+                  ->was_installed_by_custodian());
+}
+
 TEST_F(ExtensionServiceTestSupervised, UpdateWithoutPermissionIncrease) {
   InitServices(true /* profile_is_supervised */);
 
   base::FilePath base_path = data_dir().AppendASCII("autoupdate");
   base::FilePath pem_path = base_path.AppendASCII("key.pem");
 
   const Extension* extension =
       PackAndInstallCRX(base_path.AppendASCII("v1"), pem_path, INSTALL_NEW,
                         Extension::WAS_INSTALLED_BY_CUSTODIAN);
   // The extension must now be installed and enabled.
@@ skipping 357 matching lines @@
         break;
       }
     }
   }
   EXPECT_TRUE(found_delete);
 
   // Make sure there is one extension, and there are no more apps.
   EXPECT_EQ(1u, extensions_processor.data().size());
   EXPECT_TRUE(apps_processor.data().empty());
 }