cros: remove for_test in register prefs in TouchDevicesController

Bug: 817643 Test: compile and tests Change-Id: Ib5d5e1e1caa0b467d900efa9f8f197e2ec6aa613 Reviewed-on: https://chromium-review.googlesource.com/1000116 Reviewed-by: James Cook <jamescook@chromium.org> Commit-Queue: Qiang Xu <warx@google.com> Cr-Commit-Position: refs/heads/master@{#548948}
marcosholgado · Apr 6, 2018 · e534b67 · e534b67
1 parent 200e5ec
commit e534b67
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/ash/shell.cc b/ash/shell.cc
@@ -395,7 +395,7 @@ void Shell::RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test) {
   PaletteTray::RegisterProfilePrefs(registry);
   PaletteWelcomeBubble::RegisterProfilePrefs(registry);
   ShelfController::RegisterProfilePrefs(registry);
-  TouchDevicesController::RegisterProfilePrefs(registry, for_test);
+  TouchDevicesController::RegisterProfilePrefs(registry);
   CapsLockNotificationController::RegisterProfilePrefs(registry, for_test);
 }
 

diff --git a/ash/touch/touch_devices_controller.cc b/ash/touch/touch_devices_controller.cc
@@ -52,20 +52,12 @@ PrefService* GetActivePrefService() {
 }  // namespace
 
 // static
-void TouchDevicesController::RegisterProfilePrefs(PrefRegistrySimple* registry,
-                                                  bool for_test) {
-  if (for_test) {
-    // In tests there is no remote pref service. Make ash own the prefs.
-    registry->RegisterBooleanPref(
-        prefs::kTapDraggingEnabled, false,
-        user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF |
-            PrefRegistry::PUBLIC);
-  } else {
-    // In production the prefs are owned by chrome.
-    // TODO: Move ownership to ash.
-    registry->RegisterForeignPref(prefs::kTapDraggingEnabled);
-  }
-
+void TouchDevicesController::RegisterProfilePrefs(
+    PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref(
+      prefs::kTapDraggingEnabled, false,
+      user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF |
+          PrefRegistry::PUBLIC);
   registry->RegisterBooleanPref(prefs::kTouchpadEnabled, PrefRegistry::PUBLIC);
   registry->RegisterBooleanPref(prefs::kTouchscreenEnabled,
                                 PrefRegistry::PUBLIC);

diff --git a/ash/touch/touch_devices_controller.h b/ash/touch/touch_devices_controller.h
@@ -33,7 +33,7 @@ class ASH_EXPORT TouchDevicesController : public SessionObserver {
   TouchDevicesController();
   ~TouchDevicesController() override;
 
-  static void RegisterProfilePrefs(PrefRegistrySimple* registry, bool for_test);
+  static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   // Toggles the status of touchpad between enabled and disabled.
   void ToggleTouchpad();

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
@@ -239,10 +239,6 @@ void Preferences::RegisterProfilePrefs(
   registry->RegisterBooleanPref(
       ash::prefs::kShouldAlwaysShowAccessibilityMenu, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterBooleanPref(
-      ash::prefs::kTapDraggingEnabled, false,
-      user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF |
-          PrefRegistry::PUBLIC);
 
   registry->RegisterIntegerPref(
       prefs::kMouseSensitivity,