Chrome OS Touchpad Settings: Always update natural scrolling pref.

chrome/browser/chromeos/system/input_device_settings.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/system/input_device_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 335 matching lines @@
     if (argv)
       AddTPControlArguments("t5r2_three_finger_click",
                             three_finger_click_.value(),
                             argv);
   }
   if (tap_dragging_.Update(settings.tap_dragging_)) {
     updated = true;
     if (argv)
       AddTPControlArguments("tapdrag", tap_dragging_.value(), argv);
   }
-  if (natural_scroll_.Update(settings.natural_scroll_)) {
+  natural_scroll_.Update(settings.natural_scroll_);
+  // Always send natural scrolling to the shell command, as a workaround.
+  // See crbug.com/406480
+  if (natural_scroll_.is_set()) {
     updated = true;
     if (argv)
       AddTPControlArguments("australian_scrolling", natural_scroll_.value(),
                             argv);
   }
   return updated;
 }
 
 MouseSettings::MouseSettings() {}
 
@@ skipping 54 matching lines @@
 void InputDeviceSettings::SetSettingsForTesting(
     InputDeviceSettings* test_settings) {
   if (g_test_instance_ == test_settings)
     return;
   delete g_test_instance_;
   g_test_instance_ = test_settings;
 }
 
 }  // namespace system
 }  // namespace chromeos