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 105 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());
 }
 
+namespace {
+bool FindInListValue(const std::string& needle, const base::Value* haystack) {

[Mattias Nissler (ping if slow), 2015/03/18 08:36:42]

int: We'd usually put these helpers in the anonymous namespace at the top of the
file.

[Chris Masone, 2015/03/24 20:53:37]

Done.

+  const base::ListValue* list;
+  if (!haystack->GetAsList(&list))
+    return false;
+  return list->end() != list->Find(base::StringValue(needle));
+}
+}  // namespace
+
+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)));
+}

[Mattias Nissler (ping if slow), 2015/03/18 08:36:42]

Would be good to have an additional test case that verifies the fixups also take
place immediately after ownership gets established.

[Chris Masone, 2015/03/20 19:13:11]

ANy pointers on how to drive that transition in a test?

[Mattias Nissler (ping if slow), 2015/03/24 12:03:11]

OwnerSettingsServiceChromeOSTest::Setup() above calls SetPrivateKey() and
InitOwner() which trigger the transition. There's a
OwnerSettingsServiceChromeOSNoOwnerTest which starts out with no device owner.
You could have your test replicate what the Setup() code does above to trigger
the transition.

+
 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));
 }
 
 }  // namespace chromeos