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

chrome/browser/web_resource/notification_promo.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/web_resource/notification_promo.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/pref_names.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 
+using content::UserMetricsAction;
+
 namespace {
 
 // Maximum number of views.
 static const int kMaxViews = 1000;
 
 // Maximum number of hours for each time slice (4 weeks).
 static const int kMaxTimeSliceHours = 24 * 7 * 4;
 
 bool OutOfBounds(int var, int min, int max) {
   return var < min || var > max;
@@ skipping 294 matching lines @@
       group_ < max_group_ &&
       views_ < max_views_ &&
       IsPlatformAllowed(platform_) &&
       IsBuildAllowed(build_) &&
       base::Time::FromDoubleT(StartTimeWithOffset()) < base::Time::Now() &&
       base::Time::FromDoubleT(end_) > base::Time::Now() &&
       (!(feature_mask_ & NotificationPromo::FEATURE_GPLUS) || gplus_);
 }
 
 void NotificationPromo::HandleClosed() {
-  UserMetrics::RecordAction(UserMetricsAction("NTPPromoClosed"));
+  content::RecordAction(UserMetricsAction("NTPPromoClosed"));
   prefs_->SetBoolean(prefs::kNTPPromoClosed, true);
 }
 
 bool NotificationPromo::HandleViewed() {
-  UserMetrics::RecordAction(UserMetricsAction("NTPPromoShown"));
+  content::RecordAction(UserMetricsAction("NTPPromoShown"));
   if (prefs_->HasPrefPath(prefs::kNTPPromoViewsMax))
     max_views_ = prefs_->GetInteger(prefs::kNTPPromoViewsMax);
 
   if (prefs_->HasPrefPath(prefs::kNTPPromoViews))
     views_ = prefs_->GetInteger(prefs::kNTPPromoViews);
 
   prefs_->SetInteger(prefs::kNTPPromoViews, ++views_);
   return views_ >= max_views_;
 }
 
@@ skipping 61 matching lines @@
          max_group_ == other.max_group_ &&
          max_views_ == other.max_views_ &&
          platform_ == other.platform_ &&
          group_ == other.group_ &&
          views_ == other.views_ &&
          text_ == other.text_ &&
          closed_ == other.closed_ &&
          gplus_ == other.gplus_ &&
          feature_mask_ == other.feature_mask_;
 }