Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/about_flags.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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/aura_switches.h"
 #endif
 
+using content::UserMetricsAction;
+
 namespace about_flags {
 
 // Macros to simplify specifying the type.
 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
     Experiment::SINGLE_VALUE, command_line_switch, switch_value, NULL, 0
 #define SINGLE_VALUE_TYPE(command_line_switch) \
     SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, "")
 #define MULTI_VALUE_TYPE(choices) \
     Experiment::MULTI_VALUE, "", "", choices, arraysize(choices)
 
@@ skipping 647 matching lines @@
 #endif
 }
 
 void RecordUMAStatistics(const PrefService* prefs) {
   std::set<std::string> flags;
   GetEnabledFlags(prefs, &flags);
   for (std::set<std::string>::iterator it = flags.begin(); it != flags.end();
        ++it) {
     std::string action("AboutFlags_");
     action += *it;
-    UserMetrics::RecordComputedAction(action);
+    content::RecordComputedAction(action);
   }
   // Since flag metrics are recorded every startup, add a tick so that the
   // stats can be made meaningful.
   if (flags.size())
-    UserMetrics::RecordAction(UserMetricsAction("AboutFlags_StartupTick"));
-  UserMetrics::RecordAction(UserMetricsAction("StartupTick"));
+    content::RecordAction(UserMetricsAction("AboutFlags_StartupTick"));
+  content::RecordAction(UserMetricsAction("StartupTick"));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // FlagsState implementation.
 
 namespace {
 
 void FlagsState::ConvertFlagsToSwitches(
     PrefService* prefs, CommandLine* command_line) {
   if (command_line->HasSwitch(switches::kNoExperiments))
@@ skipping 150 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags