Change GestureConfiguration types to be consistent with each other and with the

chrome/browser/ui/webui/chromeos/salsa_ui.cc

 // Copyright 2013 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/ui/webui/chromeos/salsa_ui.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 
 // Whitelist of which preferences are possible targets for Salsa treatments.
 // If new preferences are added and they are to be used in an experiment, then
 // they must be added to this list as well to keep chrome://salsa from
 // changing arbitrary values.
 
 namespace {
 
 const char* kWhitelist[] = {
   prefs::kMaxSeparationForGestureTouchesInPixels,
-  prefs::kTabScrubActivationDelayInMS,
+  prefs::kTabScrubActivationDelayInMs,
   prefs::kOverscrollHorizontalThresholdComplete,
   prefs::kOverscrollVerticalThresholdComplete,
   prefs::kOverscrollMinimumThresholdStart,
   prefs::kOverscrollVerticalThresholdStart,
   prefs::kOverscrollHorizontalResistThreshold,
   prefs::kOverscrollVerticalResistThreshold,
 };
 
 void RevertPreferences(PrefService* prefs,
                        std::map<int, const base::Value*>* vals) {
@@ skipping 108 matching lines @@
 
   if (!pref)
     return;
 
   // Get our own copy of the user defined value or NULL if they are using the
   // default. You have to make a copy since they'll be used in the destructor
   // to restore the values and we need to make sure they're still around.
   orig_values_[index] =
       pref->IsDefaultValue() ? NULL : pref->GetValue()->DeepCopy();
 }