Skip OwnerSettingsServiceChromeOS with --stub-cros-settings.

When running with --stub-cros-settings, skip the owner settings service and
go straight to the CrosSettings for managing settings. This allows changes to
settings to persist to the in-memory stub copy.

This is useful for testing with a CrOS simulated environment on a linux desktop.

BUG=495403

Review URL: https://codereview.chromium.org/1164523006

Cr-Commit-Position: refs/heads/master@{#332530}

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/tpm/tpm_token_loader.h"
 #include "components/ownership/owner_key_util.h"
@@ -262,6 +263,10 @@ bool OwnerSettingsServiceChromeOS::HasPendingChanges() const {
 }
 
 bool OwnerSettingsServiceChromeOS::HandlesSetting(const std::string& setting) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kStubCrosSettings)) {
+    return false;
+  }
   return DeviceSettingsProvider::IsDeviceSetting(setting);
 }
 

chromeos/chromeos_switches.cc

@@ -280,6 +280,8 @@ const char kSmsTestMessages[] = "sms-test-messages";
 
 // Indicates that a stub implementation of CrosSettings that stores settings in
 // memory without signing should be used, treating current user as the owner.
+// This also modifies OwnerSettingsServiceChromeOS::HandlesSetting such that no
+// settings are handled by OwnerSettingsServiceChromeOS.
 // This option is for testing the chromeos build of chrome on the desktop only.
 const char kStubCrosSettings[] = "stub-cros-settings";