Lands http://codereview.chromium.org/193032 for Charlie:...

chrome/browser/options_util.cc

 // Copyright (c) 2009 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/options_util.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/metrics/metrics_service.h"
@@ skipping 12 matching lines @@
     prefs::kAlternateErrorPagesEnabled,
     prefs::kCookieBehavior,
     prefs::kDefaultCharset,
     prefs::kDnsPrefetchingEnabled,
 #if defined(OS_LINUX)
     prefs::kCertRevocationCheckingEnabled,
     prefs::kSSL2Enabled,
     prefs::kSSL3Enabled,
     prefs::kTLS1Enabled,
 #endif
+#if defined(OS_CHROMEOS)
+    prefs::kTapToClickEnabled,
+    prefs::kVertEdgeScrollEnabled,
+#endif
     prefs::kDownloadDefaultDirectory,
     prefs::kDownloadExtensionsToOpen,
     prefs::kEnableSpellCheck,
     prefs::kFormAutofillEnabled,
     prefs::kHomePage,
     prefs::kHomePageIsNewTabPage,
     prefs::kMixedContentFiltering,
     prefs::kPromptForDownload,
     prefs::kPasswordManagerEnabled,
     prefs::kRestoreOnStartup,
@@ skipping 52 matching lines @@
   if (metrics) {
     metrics->SetUserPermitsUpload(enabled);
     if (enabled)
       metrics->Start();
     else
       metrics->Stop();
   }
 
   return enabled;
 }