Revert of Don't handle NaturalScroll in Chrome but pass it to CMT instead

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/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 133 matching lines @@
 
  private:
   // Overridden from InputDeviceSettings.
   virtual void TouchpadExists(const DeviceExistsCallback& callback) OVERRIDE;
   virtual void UpdateTouchpadSettings(const TouchpadSettings& settings)
       OVERRIDE;
   virtual void SetTouchpadSensitivity(int value) OVERRIDE;
   virtual void SetTapToClick(bool enabled) OVERRIDE;
   virtual void SetThreeFingerClick(bool enabled) OVERRIDE;
   virtual void SetTapDragging(bool enabled) OVERRIDE;
-  virtual void SetNaturalScroll(bool enabled) OVERRIDE;
   virtual void MouseExists(const DeviceExistsCallback& callback) OVERRIDE;
   virtual void UpdateMouseSettings(const MouseSettings& update) OVERRIDE;
   virtual void SetMouseSensitivity(int value) OVERRIDE;
   virtual void SetPrimaryButtonRight(bool right) OVERRIDE;
   virtual bool ForceKeyboardDrivenUINavigation() OVERRIDE;
   virtual void ReapplyTouchpadSettings() OVERRIDE;
   virtual void ReapplyMouseSettings() OVERRIDE;
 
  private:
   TouchpadSettings current_touchpad_settings_;
@@ skipping 15 matching lines @@
   if (current_touchpad_settings_.Update(settings, &argv))
     ExecuteScript(argv);
 }
 
 void InputDeviceSettingsImpl::SetTouchpadSensitivity(int value) {
   TouchpadSettings settings;
   settings.SetSensitivity(value);
   UpdateTouchpadSettings(settings);
 }
 
-void InputDeviceSettingsImpl::SetNaturalScroll(bool enabled) {
-  TouchpadSettings settings;
-  settings.SetNaturalScroll(enabled);
-  UpdateTouchpadSettings(settings);
-}
-
 void InputDeviceSettingsImpl::SetTapToClick(bool enabled) {
   TouchpadSettings settings;
   settings.SetTapToClick(enabled);
   UpdateTouchpadSettings(settings);
 }
 
 void InputDeviceSettingsImpl::SetThreeFingerClick(bool enabled) {
   // For Alex/ZGB.
   TouchpadSettings settings;
   settings.SetThreeFingerClick(enabled);
@@ skipping 70 matching lines @@
 }  // namespace
 
 TouchpadSettings::TouchpadSettings() {}
 
 TouchpadSettings& TouchpadSettings::operator=(const TouchpadSettings& other) {
   if (&other != this) {
     sensitivity_ = other.sensitivity_;
     tap_to_click_ = other.tap_to_click_;
     three_finger_click_ = other.three_finger_click_;
     tap_dragging_ = other.tap_dragging_;
-    natural_scroll_ = other.natural_scroll_;
   }
   return *this;
 }
 
 void TouchpadSettings::SetSensitivity(int value) {
   sensitivity_.Set(value);
 }
 
 int TouchpadSettings::GetSensitivity() const {
   return sensitivity_.value();
 }
 
 void TouchpadSettings::SetTapToClick(bool enabled) {
   tap_to_click_.Set(enabled);
 }
 
 bool TouchpadSettings::GetTapToClick() const {
   return tap_to_click_.value();
 }
 
-void TouchpadSettings::SetNaturalScroll(bool enabled) {
-  natural_scroll_.Set(enabled);
-}
-
-bool TouchpadSettings::GetNaturalScroll() const {
-  return natural_scroll_.value();
-}
-
 void TouchpadSettings::SetThreeFingerClick(bool enabled) {
   three_finger_click_.Set(enabled);
 }
 
 bool TouchpadSettings::GetThreeFingerClick() const {
   return three_finger_click_.value();
 }
 
 void TouchpadSettings::SetTapDragging(bool enabled) {
   tap_dragging_.Set(enabled);
@@ skipping 23 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_)) {
-    updated = true;
-    if (argv)
-      AddTPControlArguments("australian_scrolling", natural_scroll_.value(),
-                            argv);
-  }
   return updated;
 }
 
 MouseSettings::MouseSettings() {}
 
 MouseSettings& MouseSettings::operator=(const MouseSettings& other) {
   if (&other != this) {
     sensitivity_ = other.sensitivity_;
     primary_button_right_ = other.primary_button_right_;
   }
@@ skipping 49 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