Fix up Owner settings on first load

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
index f1394b4d42dea08ada001c382d492b1448e27faf..67df6eaf0ce8f59c5d326a7857c9f84006cf7d4b 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
@@ -101,11 +101,11 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
       const IsOwnerCallback& callback);
 
   // Assembles PolicyData based on |settings|, |policy_data| and
-  // |user_id|.
+  // |user_id|. Applies local-owner policy fixups if needed.
   static scoped_ptr<enterprise_management::PolicyData> AssemblePolicy(
       const std::string& user_id,
       const enterprise_management::PolicyData* policy_data,
-      const enterprise_management::ChromeDeviceSettingsProto* settings);
+      enterprise_management::ChromeDeviceSettingsProto* settings);
 
   // Updates device |settings|.
   static void UpdateDeviceSettings(
@@ -127,6 +127,11 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
  private:
   friend class OwnerSettingsServiceChromeOSFactory;
 
+  // Ensures that the user_id is on the user account whitelist.
+  static void FixupLocalOwnerPolicy(
+      const std::string& user_id,
+      enterprise_management::ChromeDeviceSettingsProto* settings);
+
   // OwnerSettingsService protected interface overrides:
 
   // Reloads private key from profile's NSS slots, responds via |callback|.