Update UMA user actions parsing, primarily to include WebUI metrics.

chrome/browser/ui/webui/options/core_options_handler.cc

 // Copyright (c) 2011 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/options/core_options_handler.h"
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 163 matching lines @@
   ProcessUserMetric(value, metric);
 }
 
 void CoreOptionsHandler::ClearPref(const std::string& pref_name,
                                    const std::string& metric) {
   PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
   pref_service->ClearPref(pref_name.c_str());
   pref_service->ScheduleSavePersistentPrefs();
 
   if (!metric.empty())
-    UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
+    UserMetrics::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::ProcessUserMetric(const Value* value,
                                            const std::string& metric) {
   if (metric.empty())
     return;
 
   std::string metric_string = metric;
   if (value->IsType(Value::TYPE_BOOLEAN)) {
     bool bool_value;
     CHECK(value->GetAsBoolean(&bool_value));
     metric_string += bool_value ? "_Enable" : "_Disable";
   }
 
-  UserMetricsRecordAction(UserMetricsAction(metric_string.c_str()));
+  UserMetrics::RecordComputedAction(metric_string);
 }
 
 void CoreOptionsHandler::StopObservingPref(const std::string& path) {
   registrar_.Remove(path.c_str(), this);
 }
 
 void CoreOptionsHandler::HandleFetchPrefs(const ListValue* args) {
   // First param is name of callback function, so, there needs to be at least
   // one more element for the actual preference identifier.
   DCHECK_GE(static_cast<int>(args->GetSize()), 2);
@@ skipping 129 matching lines @@
   std::string metric;
   if (args->GetSize() > 1)
     args->GetString(1, &metric);
 
   ClearPref(pref_name, metric);
 }
 
 void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) {
   std::string metric = UTF16ToUTF8(ExtractStringValue(args));
   if (!metric.empty())
-    UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
+    UserMetrics::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::UpdateClearPluginLSOData() {
   scoped_ptr<Value> enabled(
       Value::CreateBooleanValue(clear_plugin_lso_data_enabled_.GetValue()));
   web_ui_->CallJavascriptFunction(
       "OptionsPage.setClearPluginLSODataEnabled", *enabled);
 }
 
 void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) {
@@ skipping 17 matching lines @@
       DictionaryValue* dict = new DictionaryValue;
       dict->Set("value", pref->GetValue()->DeepCopy());
       dict->SetBoolean("managed", pref->IsManaged());
       result_value.Append(dict);
 
       web_ui_->CallJavascriptFunction(WideToASCII(callback_function),
                                       result_value);
     }
   }
 }