[App banners] Add UMA metrics

chrome/browser/banners/app_banner_metrics.cc

Index: chrome/browser/banners/app_banner_metrics.cc
diff --git a/chrome/browser/android/banners/app_banner_utilities.cc b/chrome/browser/banners/app_banner_metrics.cc
similarity index 69%
rename from chrome/browser/android/banners/app_banner_utilities.cc
rename to chrome/browser/banners/app_banner_metrics.cc
index 94012bcea182ca392ebe975e8ab02c1d1ba20a09..57a7d0fb1591a7fa48e44b214d7438498913e2db 100644
--- a/chrome/browser/android/banners/app_banner_utilities.cc
+++ b/chrome/browser/banners/app_banner_metrics.cc
@@ -1,20 +1,16 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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/android/banners/app_banner_utilities.h"
-
-#include <algorithm>
-#include <string>
+#include "chrome/browser/banners/app_banner_metrics.h"
 
 #include "base/metrics/histogram.h"
-#include "chrome/browser/android/banners/app_banner_metrics_ids.h"
 
 namespace banners {
 
 void TrackDismissEvent(int event) {
   std::vector<int> codes;
-  for (int i = DISMISS_MIN + 1; i < DISMISS_MAX; ++i) {
+  for (int i = DISMISS_EVENT_MIN + 1; i < DISMISS_EVENT_MAX; ++i) {
     codes.push_back(i);
   }
   DCHECK(std::find(codes.begin(), codes.end(), event) != codes.end());
@@ -23,7 +19,7 @@ void TrackDismissEvent(int event) {
 
 void TrackDisplayEvent(int event) {
   std::vector<int> codes;
-  for (int i = DISPLAY_MIN + 1; i < DISPLAY_MAX; ++i) {
+  for (int i = DISPLAY_EVENT_MIN + 1; i < DISPLAY_EVENT_MAX; ++i) {
     codes.push_back(i);
   }
   DCHECK(std::find(codes.begin(), codes.end(), event) != codes.end());
@@ -32,7 +28,7 @@ void TrackDisplayEvent(int event) {
 
 void TrackInstallEvent(int event) {
   std::vector<int> codes;
-  for (int i = INSTALL_MIN + 1; i < INSTALL_MAX; ++i) {
+  for (int i = INSTALL_EVENT_MIN + 1; i < INSTALL_EVENT_MAX; ++i) {
     codes.push_back(i);
   }
   DCHECK(std::find(codes.begin(), codes.end(), event) != codes.end());