Fix up Owner settings on first load

chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

 // Copyright 2014 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 <queue>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
       : service_(service), provider_(provider) {
     CHECK(service_);
     CHECK(provider_);
     service_->AddObserver(this);
   }
 
   ~PrefsChecker() override { service_->RemoveObserver(this); }
 
   // OwnerSettingsService::Observer implementation:
   void OnSignedPolicyStored(bool success) override {
-    if (service_->has_pending_changes())
+    if (service_->HasPendingChanges())
       return;
 
     while (!set_requests_.empty()) {
       SetRequest request = set_requests_.front();
       set_requests_.pop();
       const base::Value* value = provider_->Get(request.first);
       ASSERT_TRUE(request.second->Equals(value));
     }
     loop_.Quit();
   }
@@ skipping 12 matching lines @@
   OwnerSettingsServiceChromeOS* service_;
   DeviceSettingsProvider* provider_;
   base::RunLoop loop_;
 
   typedef std::pair<std::string, linked_ptr<base::Value>> SetRequest;
   std::queue<SetRequest> set_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefsChecker);
 };
 
+bool FindInListValue(const std::string& needle, const base::Value* haystack) {
+  const base::ListValue* list;
+  if (!haystack->GetAsList(&list))
+    return false;
+  return list->end() != list->Find(base::StringValue(needle));
+}
+
 }  // namespace
 
 class OwnerSettingsServiceChromeOSTest : public DeviceSettingsTestBase {
  public:
   OwnerSettingsServiceChromeOSTest()
       : service_(nullptr),
         local_state_(TestingBrowserProcess::GetGlobal()),
         user_data_dir_override_(chrome::DIR_USER_DATA),
         management_settings_set_(false) {}
 
@@ skipping 25 matching lines @@
     PrefsChecker checker(service, provider_.get());
     checker.Set(setting, in_value);
     FlushDeviceSettings();
     checker.Wait();
   }
 
   void OnManagementSettingsSet(bool success) {
     management_settings_set_ = success;
   }
 
+ protected:
   OwnerSettingsServiceChromeOS* service_;
   ScopedTestingLocalState local_state_;
   scoped_ptr<DeviceSettingsProvider> provider_;
   base::ScopedPathOverride user_data_dir_override_;
   bool management_settings_set_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSTest);
 };
 
@@ skipping 151 matching lines @@
   // Check that the loaded policy_data contains the expected values.
   const em::PolicyData* policy_data = device_settings_service_.policy_data();
   EXPECT_EQ(policy::dm_protocol::kChromeDevicePolicyType,
             policy_data->policy_type());
   EXPECT_EQ(device_settings_service_.GetUsername(), policy_data->username());
   EXPECT_EQ(em::PolicyData::CONSUMER_MANAGED, policy_data->management_mode());
   EXPECT_EQ("fake_request_token", policy_data->request_token());
   EXPECT_EQ("fake_device_id", policy_data->device_id());
 }
 
+TEST_F(OwnerSettingsServiceChromeOSTest, ForceWhitelist) {
+  EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
+                               provider_->Get(kAccountsPrefUsers)));
+  // Force a settings write.
+  TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
+  EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
+                              provider_->Get(kAccountsPrefUsers)));
+}
+
 class OwnerSettingsServiceChromeOSNoOwnerTest
     : public OwnerSettingsServiceChromeOSTest {
  public:
   OwnerSettingsServiceChromeOSNoOwnerTest() {}
   ~OwnerSettingsServiceChromeOSNoOwnerTest() override {}
 
   void SetUp() override {
     DeviceSettingsTestBase::SetUp();
     provider_.reset(new DeviceSettingsProvider(base::Bind(&OnPrefChanged),
                                                &device_settings_service_));
     FlushDeviceSettings();
     service_ = OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
         profile_.get());
     ASSERT_TRUE(service_);
     ASSERT_FALSE(service_->IsOwner());
   }
 
   void TearDown() override { DeviceSettingsTestBase::TearDown(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOSNoOwnerTest);
 };
 
 TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, SingleSetTest) {
   ASSERT_FALSE(service_->SetBoolean(kAccountsPrefAllowGuest, false));
 }
 
+TEST_F(OwnerSettingsServiceChromeOSNoOwnerTest, TakeOwnershipForceWhitelist) {
+  EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
+                               provider_->Get(kAccountsPrefUsers)));
+  owner_key_util_->SetPrivateKey(device_policy_.GetSigningKey());
+  InitOwner(device_policy_.policy_data().username(), true);
+  ReloadDeviceSettings();
+  ASSERT_TRUE(service_->IsOwner());
+
+  EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
+                              provider_->Get(kAccountsPrefUsers)));
+}
+
 }  // namespace chromeos