yRevert 57093 - dom-ui options: record user metrics for pref changes.

BUG=52520
TEST=Verify metrics are saved when changing options in dom-ui options window (--enable-tabbed-options).
Review URL: http://codereview.chromium.org/3190004

TBR=csilv@chromium.org
Review URL: http://codereview.chromium.org/3119038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57096 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 70 insertions, 206 deletions

diff --git a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc
index a8355cd..4f66cd7 100644
--- a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.cc
@@ -7,7 +7,6 @@
 #include "base/json/json_reader.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/chromeos/cros_settings.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/notification_service.h"
 
 namespace chromeos {
@@ -31,11 +30,9 @@ void CoreChromeOSOptionsHandler::ObservePref(const std::string& pref_name) {
 
 void CoreChromeOSOptionsHandler::SetPref(const std::string& pref_name,
                                          Value::ValueType pref_type,
-                                         const std::string& value_string,
-                                         const std::string& metric) {
+                                         const std::string& value_string) {
   if (!CrosSettings::IsCrosSettings(pref_name))
-    return ::CoreOptionsHandler::SetPref(pref_name, pref_type, value_string,
-                                         metric);
+    return ::CoreOptionsHandler::SetPref(pref_name, pref_type, value_string);
 
   CrosSettings* cros_settings = CrosSettings::Get();
   switch (pref_type) {
@@ -60,8 +57,6 @@ void CoreChromeOSOptionsHandler::SetPref(const std::string& pref_name,
       break;
     }
   }
-
-  ProcessUserMetric(pref_type, value_string, metric);
 }
 
 void CoreChromeOSOptionsHandler::Observe(NotificationType type,
diff --git a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
index aa58c29..80acdd3 100644
--- a/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
+++ b/chrome/browser/chromeos/dom_ui/core_chromeos_options_handler.h
@@ -20,8 +20,7 @@ class CoreChromeOSOptionsHandler : public ::CoreOptionsHandler {
   virtual void ObservePref(const std::string& pref_name);
   virtual void SetPref(const std::string& pref_name,
                        Value::ValueType pref_type,
-                       const std::string& value_string,
-                       const std::string& metric);
+                       const std::string& value_string);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/dom_ui/advanced_options_handler.cc b/chrome/browser/dom_ui/advanced_options_handler.cc
index d23dfeb..21095e7 100644
--- a/chrome/browser/dom_ui/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/advanced_options_handler.cc
@@ -218,15 +218,11 @@ void AdvancedOptionsHandler::HandleSelectDownloadLocation(
 
 void AdvancedOptionsHandler::FileSelected(const FilePath& path, int index,
                                           void* params) {
-  UserMetricsRecordAction(UserMetricsAction("Options_SetDownloadDirectory"),
-                          NULL);
   default_download_location_.SetValue(path);
   SetupDownloadLocationPath();
 }
 
 void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction("Options_ResetAutoOpenFiles"),
-                          NULL);
   DCHECK(dom_ui_);
   DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager();
   if (manager) manager->ResetAutoOpenFiles();
@@ -235,20 +231,12 @@ void AdvancedOptionsHandler::HandleAutoOpenButton(const ListValue* args) {
 #if defined(OS_WIN)
 void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
     const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction(metric.c_str()), NULL);
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  std::string metric =
-      (checked_str == "true" ? "Options_CheckCertRevocation_Enable"
-                             : "Options_CheckCertRevocation_Disable");
   net::SSLConfigServiceWin::SetRevCheckingEnabled(checked_str == "true");
 }
 
 void AdvancedOptionsHandler::HandleUseSSL2Checkbox(const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction(metric.c_str()), NULL);
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
-  std::string metric =
-      (checked_str == "true" ? "Options_SSL2_Enable"
-                             : "Options_SSL2_Disable");
   net::SSLConfigServiceWin::SetSSL2Enabled(checked_str == "true");
 }
 
diff --git a/chrome/browser/dom_ui/browser_options_handler.cc b/chrome/browser/dom_ui/browser_options_handler.cc
index 1405d1e..bcad24b 100644
--- a/chrome/browser/dom_ui/browser_options_handler.cc
+++ b/chrome/browser/dom_ui/browser_options_handler.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
 #include "chrome/browser/dom_ui/options_managed_banner_handler.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/options_window.h"
@@ -140,8 +139,6 @@ void BrowserOptionsHandler::UpdateDefaultBrowserState() {
 }
 
 void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {
-  UserMetricsRecordAction(UserMetricsAction("Options_SetAsDefaultBrowser"),
-                          NULL);
 #if defined(OS_MACOSX)
   if (ShellIntegration::SetAsDefaultBrowser())
     UpdateDefaultBrowserState();
@@ -229,9 +226,6 @@ void BrowserOptionsHandler::SetDefaultSearchEngine(const ListValue* args) {
   if (selected_index >= 0 &&
       selected_index < static_cast<int>(model_urls.size()))
     template_url_model_->SetDefaultSearchProvider(model_urls[selected_index]);
-
-  UserMetricsRecordAction(UserMetricsAction("Options_SearchEngineChanged"),
-                          NULL);
 }
 
 void BrowserOptionsHandler::UpdateSearchEngines() {
diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/core_options_handler.cc
index 37171cf..9137326 100644
--- a/chrome/browser/dom_ui/core_options_handler.cc
+++ b/chrome/browser/dom_ui/core_options_handler.cc
@@ -9,11 +9,10 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/pref_service.h"
-#include "chrome/browser/profile.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
+#include "chrome/browser/pref_service.h"
+#include "chrome/browser/profile.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -111,8 +110,6 @@ void CoreOptionsHandler::RegisterMessages() {
       NewCallback(this, &CoreOptionsHandler::HandleSetStringPref));
   dom_ui_->RegisterMessageCallback("setObjectPref",
       NewCallback(this, &CoreOptionsHandler::HandleSetObjectPref));
-  dom_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction",
-      NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction));
 }
 
 void CoreOptionsHandler::HandleInitialize(const ListValue* args) {
@@ -146,8 +143,7 @@ void CoreOptionsHandler::ObservePref(const std::string& pref_name) {
 
 void CoreOptionsHandler::SetPref(const std::string& pref_name,
                                  Value::ValueType pref_type,
-                                 const std::string& value_string,
-                                 const std::string& metric) {
+                                 const std::string& value_string) {
   DCHECK(dom_ui_);
   PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
 
@@ -166,22 +162,6 @@ void CoreOptionsHandler::SetPref(const std::string& pref_name,
     default:
       NOTREACHED();
   }
-
-  ProcessUserMetric(pref_type, value_string, metric);
-}
-
-void CoreOptionsHandler::ProcessUserMetric(Value::ValueType pref_type,
-                                           const std::string& value_string,
-                                           const std::string& metric) {
-  if (metric.empty())
-    return;
-
-  std::string metric_string = metric;
-  if (pref_type == Value::TYPE_BOOLEAN)
-    metric_string += (value_string == "true" ? "_Enable" : "_Disable");
-
-  UserMetricsRecordAction(UserMetricsAction(metric_string.c_str()),
-                          dom_ui_->GetProfile()->GetPrefs());
 }
 
 void CoreOptionsHandler::HandleFetchPrefs(const ListValue* args) {
@@ -222,6 +202,8 @@ void CoreOptionsHandler::HandleFetchPrefs(const ListValue* args) {
 }
 
 void CoreOptionsHandler::HandleObservePrefs(const ListValue* args) {
+  DictionaryValue result_value;
+
   // First param is name is JS callback function name, the rest are pref
   // identifiers that we are observing.
   const size_t kMinObservePrefsParamCount = 2;
@@ -272,7 +254,7 @@ void CoreOptionsHandler::HandleSetObjectPref(const ListValue* args) {
 
 void CoreOptionsHandler::HandleSetPref(const ListValue* args,
                                        Value::ValueType type) {
-  if (args->GetSize() < 2)
+  if (args->GetSize() != 2)
     return;
 
   std::string pref_name;
@@ -283,17 +265,7 @@ void CoreOptionsHandler::HandleSetPref(const ListValue* args,
   if (!args->GetString(1, &value_string))
     return;
 
-  std::string metric;
-  if (args->GetSize() > 2)
-    args->GetString(2, &metric);
-
-  SetPref(pref_name, type, value_string, metric);
-}
-
-void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) {
-  std::string metric = WideToUTF8(ExtractStringValue(args));
-  if (!metric.empty())
-    UserMetricsRecordAction(UserMetricsAction(metric.c_str()), NULL);
+  SetPref(pref_name, type, value_string);
 }
 
 void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) {
diff --git a/chrome/browser/dom_ui/core_options_handler.h b/chrome/browser/dom_ui/core_options_handler.h
index 9eaf44a..4a51cad 100644
--- a/chrome/browser/dom_ui/core_options_handler.h
+++ b/chrome/browser/dom_ui/core_options_handler.h
@@ -41,13 +41,7 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
   // Sets a pref value |value_string| of |pref_type| to given |pref_name|.
   virtual void SetPref(const std::string& pref_name,
                        Value::ValueType pref_type,
-                       const std::string& value_string,
-                       const std::string& metric);
-
-  // Records a user metric action for the given value.
-  void ProcessUserMetric(Value::ValueType pref_type,
-                         const std::string& value_string,
-                         const std::string& metric);
+                       const std::string& value_string);
 
   typedef std::multimap<std::string, std::wstring> PreferenceCallbackMap;
   PreferenceCallbackMap pref_callback_map_;
@@ -77,10 +71,6 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
 
   void HandleSetPref(const ListValue* args, Value::ValueType type);
 
-  // Callback for the "coreOptionsUserMetricsAction" message.  This records
-  // an action that should be tracked if metrics recording is enabled.
-  void HandleUserMetricsAction(const ListValue* args);
-
   void NotifyPrefChanged(const std::string* pref_name);
 
   DISALLOW_COPY_AND_ASSIGN(CoreOptionsHandler);
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index de1cbeb..c76b52e 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -13,24 +13,21 @@
       <div><a target="_blank" i18n-content="privacyLearnMoreLabel"
           i18n-values="href:privacyLearnMoreURL"></a></div>
       <label><input id="alternateErrorPagesEnabled"
-          pref="alternate_error_pages.enabled"
-          metric="Options_LinkDoctorCheckbox" type="checkbox"><span
+          pref="alternate_error_pages.enabled" type="checkbox"><span
           i18n-content="linkDoctorPref"></span></label>
       <label><input id="searchSuggestEnabled"
-          pref="search.suggest_enabled" metric="Options_UseSuggestCheckbox"
-          type="checkbox"><span i18n-content="suggestPref"></span></label>
+          pref="search.suggest_enabled" type="checkbox"><span
+          i18n-content="suggestPref"></span></label>
       <label><input id="dnsPrefetchingEnabled"
-          pref="dns_prefetching.enabled" metric="Options_DnsPrefetchCheckbox"
-          type="checkbox"><span
-          i18n-content="networkDNSPrefetchEnabledDescription"></span></label>
+          pref="dns_prefetching.enabled" type="checkbox"><span
+          i18n-content="networkDNSPrefetchEnabledDescription"></span>
+          </label>
       <label><input id="safeBrowsingEnabled"
-          pref="safebrowsing.enabled" metric="Options_SafeBrowsingCheckbox"
-          type="checkbox"><span i18n-content="safeBrowsingEnableProtection">
-          </span></label>
+          pref="safebrowsing.enabled" type="checkbox"><span
+          i18n-content="safeBrowsingEnableProtection"></span></label>
 <if expr="pp_ifdef('_google_chrome')">
       <label><input id="metricsReportingEnabled"
-          pref="user_experience_metrics.reporting_enabled"
-          metric="Options_MetricsReportingCheckbox" type="checkbox">
+          pref="user_experience_metrics.reporting_enabled" type="checkbox">
           <span i18n-content="enableLogging"></span></label>
 </if>
     </div>
@@ -47,8 +44,8 @@
     <h3 i18n-content="advancedSectionTitleTranslate"></h3>
     <div>
       <label><input id="enableTranslate"
-          pref="translate.enabled" metric="Options_Translate" type="checkbox">
-          <span i18n-content="translateEnableTranslate"></span></label>
+          pref="translate.enabled" type="checkbox"><span
+          i18n-content="translateEnableTranslate"></span></label>
     </div>
   </section>
   <section>
@@ -62,8 +59,7 @@
             i18n-content="downloadLocationBrowseButton"></button>
       </div>
       <label><input id="promptForDownload"
-          pref="download.prompt_for_download"
-          metric="Options_AskForSaveLocation" type="checkbox"><span
+          pref="download.prompt_for_download" type="checkbox"><span
           i18n-content="downloadLocationAskForSaveLocation"></span></label>
 </if>
       <div i18n-content="autoOpenFileTypesInfo"></div>
@@ -76,8 +72,8 @@
     <div>
 <if expr="os == 'darwin'">
       <label><input id="tabsToLinksPref"
-          pref="webkit.webprefs.tabs_to_links" metric="Options_TabsToLinks"
-          type="checkbox"><span i18n-content="tabsToLinksPref"></span></label>
+          pref="webkit.webprefs.tabs_to_links" type="checkbox"><span
+          i18n-content="tabsToLinksPref"></span></label>
 </if>
       <div><button id="fontSettingsConfigureFontsOnlyButton"
           i18n-content="fontSettingsConfigureFontsOnlyButton"></button></div>
@@ -112,17 +108,16 @@
 <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)">
       <!-- Configure these options for Linux/BSD as preference keys -->
       <label><input id="sslCheckRevocation"
-          pref="ssl.rev_checking.enabled" metric="Options_CheckCertRevocation"
-          type="checkbox"><span i18n-content="sslCheckRevocation"></span>
-          </label>
+          pref="ssl.rev_checking.enabled" type="checkbox"><span
+          i18n-content="sslCheckRevocation"></span></label>
       <label><input id="sslUseSSL2"
-          pref="ssl.ssl2.enabled" metric="Options_SSL2" type="checkbox"><span
+          pref="ssl.ssl2.enabled" type="checkbox"><span
           i18n-content="sslUseSSL2"></span></label>
       <label><input id="sslUseSSL3"
-          pref="ssl.ssl3.enabled" metric="Options_SSL3" type="checkbox"><span
+          pref="ssl.ssl3.enabled" type="checkbox"><span
           i18n-content="sslUseSSL3"></span></label>
       <label><input id="sslUseTLS1"
-          pref="ssl.tls1.enabled" metric="Options_TLS1" type="checkbox"><span
+          pref="ssl.tls1.enabled" type="checkbox"><span
           i18n-content="sslUseTLS1"></span></label>
 </if>
 <if expr="not pp_ifdef('chromeos')">
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index d03e26e..57ef20f 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -30,19 +30,15 @@ var OptionsPage = options.OptionsPage;
       $('privacyContentSettingsButton').onclick = function(event) {
         OptionsPage.showPageByName('content');
         OptionsPage.showTab($('cookies-nav-tab'));
-        chrome.send('coreOptionsUserMetricsAction',
-            ['Options_ContentSettings']);
       };
       $('privacyClearDataButton').onclick = function(event) {
         OptionsPage.showOverlay('clearBrowserDataOverlay');
-        chrome.send('coreOptionsUserMetricsAction', ['Options_ClearData']);
       };
       $('autoOpenFileTypesResetToDefault').onclick = function(event) {
         chrome.send('autoOpenFileTypesAction');
       };
       $('fontSettingsConfigureFontsOnlyButton').onclick = function(event) {
         OptionsPage.showOverlay('fontSettingsOverlay');
-        chrome.send('coreOptionsUserMetricsAction', ['Options_FontSettings']);
       };
 
       if (!cr.isChromeOS) {
@@ -65,8 +61,6 @@ var OptionsPage = options.OptionsPage;
       } else {
         $('proxiesConfigureButton').onclick = function(event) {
           OptionsPage.showPageByName('proxy');
-          chrome.send('coreOptionsUserMetricsAction',
-              ['Options_ShowProxySettings']);
         };
       }
 
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index 46b1601..ccd4f88 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -6,8 +6,7 @@
   </h1>
 
   <div class="autofill-section">
-    <label><input id="autoFillEnabled" pref="autofill.enabled"
-        metric="Options_FormAutofill" type="checkbox">
+    <label><input id="autoFillEnabled" pref="autofill.enabled"type="checkbox">
         <span i18n-content="autoFillEnabled"></span></label>
   </div>
 
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html
index 3e9a9c5..d9ae42a 100644
--- a/chrome/browser/resources/options/browser_options.html
+++ b/chrome/browser/resources/options/browser_options.html
@@ -4,17 +4,14 @@
     <h3 i18n-content="startupGroupName"></h3>
     <div>
       <label><input type="radio" name="startup"
-          pref="session.restore_on_startup" value="0"
-          metric="Options_Startup_Homepage">
-          <span i18n-content="startupShowDefaultAndNewTab"></span></label>
+          pref="session.restore_on_startup" value="0"><span
+          i18n-content="startupShowDefaultAndNewTab"></span></label>
       <label><input type="radio" name="startup"
-          pref="session.restore_on_startup" value="1"
-          metric="Options_Startup_LastSession">
-          <span i18n-content="startupShowLastSession"></span></label>
+          pref="session.restore_on_startup" value="1"><span
+          i18n-content="startupShowLastSession"></span></label>
       <label><input type="radio" name="startup" id="startupShowPagesButton"
-          pref="session.restore_on_startup" value="4"
-          metric="Options_Startup_Custom">
-          <span i18n-content="startupShowPages"></span></label>
+          pref="session.restore_on_startup" value="4"><span
+          i18n-content="startupShowPages"></span></label>
       <div class="suboption">
         <div class="left-side-table">
           <div>
@@ -36,21 +33,18 @@
     <h3 i18n-content="homepageGroupName"></h3>
     <div>
       <label><input type="radio" name="homepage"
-          pref="homepage_is_newtabpage" value="true"
-          metric="Options_Homepage_IsNewTabPage">
-          <span i18n-content="homepageUseNewTab"></span></label>
+          pref="homepage_is_newtabpage" value="true"><span
+          i18n-content="homepageUseNewTab"></span></label>
       <label><input type="radio" name="homepage" id="homepageUseURLButton"
-          pref="homepage_is_newtabpage" value="false"
-          metric="Options_Homepage_IsNewTabPage">
-          <span i18n-content="homepageUseURL"></span></label>
+          pref="homepage_is_newtabpage" value="false"><span
+          i18n-content="homepageUseURL"></span></label>
       <div class="suboption">
         <input id="homepageURL" type="url" pref="homepage">
       </div>
       <div class="option">
         <label><input id="homepageShowButton"
-            pref="browser.show_home_button"
-            metric="Options_Homepage_HomeButton" type="checkbox">
-            <span i18n-content="homepageShowButton"></span></label>
+            pref="browser.show_home_button" type="checkbox"><span
+            i18n-content="homepageShowButton"></span></label>
       </div>
     </div>
   </section>
diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 71465c1..d4f725d 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -39,8 +39,6 @@ cr.define('options', function() {
       };
       $('defaultSearchManageEnginesButton').onclick = function(event) {
         OptionsPage.showPageByName('searchEngines');
-        chrome.send('coreOptionsUserMetricsAction',
-            ['Options_ManageSearchEngines']);
       };
       if (!cr.isChromeOS) {
         $('defaultBrowserUseAsDefaultButton').onclick = function(event) {
diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index 38bd04a..5756ce9 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.js
@@ -55,7 +55,6 @@ cr.define('options', function() {
       };
 
       $('show-cookies-button').onclick = function(event) {
-        chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
         // TODO(estade): show cookies and other site data page.
       };
     },
diff --git a/chrome/browser/resources/options/font_settings_overlay.html b/chrome/browser/resources/options/font_settings_overlay.html
index 1efed64..4a6757c 100644
--- a/chrome/browser/resources/options/font_settings_overlay.html
+++ b/chrome/browser/resources/options/font_settings_overlay.html
@@ -7,14 +7,12 @@
         <label style="display:inline;">
           <span i18n-content="fontSettingsSerifLabel"></span>
           <select id="fontSettingsSerifSelector"
-              pref="webkit.webprefs.serif_font_family"
-              metric="Options_ChangeSerifFont"></select>
+              pref="webkit.webprefs.serif_font_family"></select>
         </label>
         <label style="display:inline;">
           <span i18n-content="fontSettingsSizeLabel"></span>
           <select id="fontSettingsSerifSizeSelector"
-              pref="webkit.webprefs.default_font_size"
-              metric="Options_ChangeSerifFontSize"></select>
+              pref="webkit.webprefs.default_font_size"></select>
         </label>
         <div id="fontSettingsSerifPreview"></div>
       </div>
@@ -22,14 +20,12 @@
         <label style="display:inline;">
           <span i18n-content="fontSettingsSansSerifLabel"></span>
           <select id="fontSettingsSansSerifSelector"
-              pref="webkit.webprefs.sansserif_font_family"
-              metric="Options_ChangeSansSerifFont"></select>
+              pref="webkit.webprefs.sansserif_font_family"></select>
         </label>
         <label style="display:inline;">
           <span i18n-content="fontSettingsSizeLabel"></span>
           <select id="fontSettingsSansSerifSizeSelector"
-              pref="webkit.webprefs.default_font_size"
-              metric="Options_ChangeSansSerifFontSize"></select>
+              pref="webkit.webprefs.default_font_size"></select>
         </label>
         <div id="fontSettingsSansSerifPreview"></div>
       </div>
@@ -37,14 +33,12 @@
         <label style="display:inline;">
           <span i18n-content="fontSettingsFixedWidthLabel"></span>
           <select id="fontSettingsFixedWidthSelector"
-              pref="webkit.webprefs.fixed_font_family"
-              metric="Options_ChangeFixedFont"></select>
+              pref="webkit.webprefs.fixed_font_family"></select>
         </label>
         <label style="display:inline;">
           <span i18n-content="fontSettingsSizeLabel"></span>
           <select id="fontSettingsFixedWidthSizeSelector"
-              pref="webkit.webprefs.default_fixed_font_size"
-              metric="Options_ChangeFixedFontSize"></select>
+              pref="webkit.webprefs.default_fixed_font_size"></select>
         </label>
         <div id="fontSettingsFixedWidthPreview"></div>
       </div>
@@ -56,8 +50,7 @@
       <label style="display:inline;">
         <span i18n-content="fontSettingsEncodingLabel"></span>
         <select id="fontSettingsEncodingSelector"
-            pref="intl.charset_default" metric="Options_ChangeFontEncoding">
-        </select>
+            pref="intl.charset_default"></select>
       </label>
     </div>
   </section>
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index 879f14e..a90cb50 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -29,14 +29,14 @@
         <input id="passwords_asktosave"
             name="passwords_radio"
             pref="profile.password_manager_enabled"
-            type="radio" value="true" metric="Options_PasswordManager">
+            type="radio" value="true">
         <span i18n-content="passwords_asktosave"></span>
       </label>
       <label>
         <input id="passwords_neversave"
             name="passwords_radio"
             pref="profile.password_manager_enabled"
-            type="radio" value="false" metric="Options_PasswordManager">
+            type="radio" value="false">
         <span i18n-content="passwords_neversave"></span>
       </label>
       <div><button id="showpasswords"
@@ -71,13 +71,13 @@
       <label>
         <input name="decorations_radio"
             pref="browser.custom_chrome_frame"
-            type="radio" value="false" metric="Options_CustomFrame">
+            type="radio" value="false">
         <span i18n-content="showWindow_decorations_radio"></span>
       </label>
       <label>
         <input name="decorations_radio"
             pref="browser.custom_chrome_frame"
-            type="radio" value="true" metric="Options_CustomFrame">
+            type="radio" value="true">
         <span i18n-content="hideWindow_decorations_radio"></span>
       </label>
     </div>
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 7b9f170..4ffd2b9 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -50,14 +50,10 @@ cr.define('options', function() {
         PasswordsExceptions.load();
         OptionsPage.showPageByName('passwordsExceptions');
         OptionsPage.showTab($('passwords-nav-tab'));
-        chrome.send('coreOptionsUserMetricsAction',
-            ['Options_ShowPasswordsExceptions']);
       };
 
       $('autofill_options').onclick = function(event) {
         OptionsPage.showPageByName('autoFillOptions');
-        chrome.send('coreOptionsUserMetricsAction',
-            ['Options_ShowAutoFillSettings']);
       };
 
       if (!cr.isChromeOS) {
@@ -67,7 +63,6 @@ cr.define('options', function() {
         $('import_data').onclick = function(event) {
           ImportDataOverlay.loadImporter();
           OptionsPage.showOverlay('importDataOverlay');
-          chrome.send('coreOptionsUserMetricsAction', ['Import_ShowDlg']);
         };
       }
 
diff --git a/chrome/browser/resources/options/pref_ui.js b/chrome/browser/resources/options/pref_ui.js
index ffc7ae7..a09e737e 100644
--- a/chrome/browser/resources/options/pref_ui.js
+++ b/chrome/browser/resources/options/pref_ui.js
@@ -33,7 +33,7 @@ cr.define('options', function() {
       // Listen to user events.
       this.addEventListener('click',
           function(e) {
-            Preferences.setBooleanPref(self.pref, self.checked, self.metric);
+            Preferences.setBooleanPref(self.pref, self.checked);
           });
     }
   };
@@ -44,12 +44,6 @@ cr.define('options', function() {
    */
   cr.defineProperty(PrefCheckbox, 'pref', cr.PropertyKind.ATTR);
 
-  /**
-   * The user metric string.
-   * @type {string}
-   */
-  cr.defineProperty(PrefCheckbox, 'metric', cr.PropertyKind.ATTR);
-
   /////////////////////////////////////////////////////////////////////////////
   // PrefRadio class:
 
@@ -80,10 +74,10 @@ cr.define('options', function() {
           function(e) {
             if(self.value == 'true' || self.value == 'false') {
               Preferences.setBooleanPref(self.pref,
-                  self.value == 'true', self.metric);
+                  self.value == 'true');
             } else {
               Preferences.setIntegerPref(self.pref,
-                  parseInt(self.value, 10), self.metric);
+                  parseInt(self.value, 10));
             }
           });
     },
@@ -103,11 +97,6 @@ cr.define('options', function() {
     }
   };
 
-  /**
-   * The user metric string.
-   * @type {string}
-   */
-  cr.defineProperty(PrefRadio, 'metric', cr.PropertyKind.ATTR);
 
   /////////////////////////////////////////////////////////////////////////////
   // PrefNumeric class:
@@ -135,7 +124,7 @@ cr.define('options', function() {
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
-            Preferences.setIntegerPref(self.pref, self.value, self.metric);
+            Preferences.setIntegerPref(self.pref, self.value);
           });
     }
   };
@@ -146,12 +135,6 @@ cr.define('options', function() {
    */
   cr.defineProperty(PrefNumeric, 'pref', cr.PropertyKind.ATTR);
 
-  /**
-   * The user metric string.
-   * @type {string}
-   */
-  cr.defineProperty(PrefNumeric, 'metric', cr.PropertyKind.ATTR);
-
   /////////////////////////////////////////////////////////////////////////////
   // PrefNumber class:
 
@@ -226,15 +209,15 @@ cr.define('options', function() {
             switch(self.dataType) {
               case 'number':
                 Preferences.setIntegerPref(self.pref,
-                    self.options[self.selectedIndex].value, self.metric);
+                    self.options[self.selectedIndex].value);
                 break;
               case 'boolean':
                 Preferences.setBooleanValue(self.pref,
-                    self.options[self.selectedIndex].value, self.metric);
+                    self.options[self.selectedIndex].value);
                 break;
               case 'string':
                 Preferences.setStringPref(self.pref,
-                    self.options[self.selectedIndex].value, self.metric);
+                    self.options[self.selectedIndex].value);
                 break;
             }
           });
@@ -272,12 +255,6 @@ cr.define('options', function() {
    */
   cr.defineProperty(PrefSelect, 'pref', cr.PropertyKind.ATTR);
 
-  /**
-   * The user metric string.
-   * @type {string}
-   */
-  cr.defineProperty(PrefSelect, 'metric', cr.PropertyKind.ATTR);
-
   /////////////////////////////////////////////////////////////////////////////
   // PrefTextField class:
 
@@ -305,7 +282,7 @@ cr.define('options', function() {
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
-            Preferences.setStringPref(self.pref, self.value, self.metric);
+            Preferences.setStringPref(self.pref, self.value);
           });
 
       window.addEventListener('unload',
@@ -322,12 +299,6 @@ cr.define('options', function() {
    */
   cr.defineProperty(PrefTextField, 'pref', cr.PropertyKind.ATTR);
 
-  /**
-   * The user metric string.
-   * @type {string}
-   */
-  cr.defineProperty(PrefTextField, 'metric', cr.PropertyKind.ATTR);
-
   // Export
   return {
     PrefCheckbox: PrefCheckbox,
diff --git a/chrome/browser/resources/options/preferences.js b/chrome/browser/resources/options/preferences.js
index b641f37..72d1a09 100644
--- a/chrome/browser/resources/options/preferences.js
+++ b/chrome/browser/resources/options/preferences.js
@@ -41,12 +41,9 @@ cr.define('options', function() {
    * and signals its changed value.
    * @param {string} name Preference name.
    * @param {boolean} value New preference value.
-   * @param {string} metric User metrics identifier.
    */
-  Preferences.setBooleanPref = function (name, value, metric) {
-    var arguments = [name, value ? 'true' : 'false'];
-    if (metric != undefined) arguments.push(metric);
-    chrome.send('setBooleanPref', arguments);
+  Preferences.setBooleanPref = function (name, value) {
+    chrome.send('setBooleanPref', [name, value ? 'true' : 'false']);
   };
 
   /**
@@ -54,12 +51,9 @@ cr.define('options', function() {
    * and signals its changed value.
    * @param {string} name Preference name.
    * @param {number} value New preference value.
-   * @param {string} metric User metrics identifier.
    */
-  Preferences.setIntegerPref = function(name, value, metric) {
-    var arguments = [name, String(value)];
-    if (metric != undefined) arguments.push(metric);
-    chrome.send('setIntegerPref', arguments);
+  Preferences.setIntegerPref = function(name, value) {
+    chrome.send('setIntegerPref', [name, String(value)]);
   };
 
   /**
@@ -67,12 +61,9 @@ cr.define('options', function() {
    * and signals its changed value.
    * @param {string} name Preference name.
    * @param {string} value New preference value.
-   * @param {string} metric User metrics identifier.
    */
-  Preferences.setStringPref = function(name, value, metric) {
-    var arguments = [name, value];
-    if (metric != undefined) arguments.push(metric);
-    chrome.send('setStringPref', arguments);
+  Preferences.setStringPref = function(name, value) {
+    chrome.send('setStringPref', [name, value]);
   };
 
   /**
@@ -80,12 +71,9 @@ cr.define('options', function() {
    * and signals its changed value.
    * @param {string} name Preference name.
    * @param {string} value New preference value.
-   * @param {string} metric User metrics identifier.
    */
-  Preferences.setObjectPref = function(name, value, metric) {
-    var arguments = [name, JSON.stringify(value)];
-    if (metric != undefined) arguments.push(metric);
-    chrome.send('setObjectPref', arguments);
+  Preferences.setObjectPref = function(name, value) {
+    chrome.send('setObjectPref', [name, JSON.stringify(value)]);
   };
 
   Preferences.prototype = {