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

chrome/browser/search_engines/template_url.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/search_engines/template_url.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
+
+using content::UserMetricsAction;
+
 // TODO(pastarmovj): Remove google_update_settings and user_metrics when the
 // CollectRLZMetrics function is not needed anymore.
 
 // The TemplateURLRef has any number of terms that need to be replaced. Each of
 // the terms is enclosed in braces. If the character preceeding the final
 // brace is a ?, it indicates the term is optional and can be replaced with
 // an empty string.
 static const char kStartParameter = '{';
 static const char kEndParameter = '}';
 static const char kOptional = '?';
@@ skipping 535 matching lines @@
   ParseIfNecessary();
   for (size_t i = 0; i < replacements_.size(); ++i) {
     // We are interesed in searches that were supposed to send the RLZ token.
     if (replacements_[i].type == GOOGLE_RLZ) {
       std::string brand;
       // We only have RLZ tocken on a branded browser version.
       if (google_util::GetBrand(&brand) && !brand.empty() &&
            !google_util::IsOrganic(brand)) {
         // Now we know we should have had RLZ token check if there was one.
         if (url().find("rlz=") != std::string::npos)
-          UserMetrics::RecordAction(UserMetricsAction("SearchWithRLZ"));
+          content::RecordAction(UserMetricsAction("SearchWithRLZ"));
         else
-          UserMetrics::RecordAction(UserMetricsAction("SearchWithoutRLZ"));
+          content::RecordAction(UserMetricsAction("SearchWithoutRLZ"));
       }
       return;
     }
   }
 #endif
 }
 
 void TemplateURLRef::InvalidateCachedValues() const {
   supports_replacements_ = valid_ = parsed_ = false;
   host_.clear();
@@ skipping 154 matching lines @@
 }
 
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(url_.url()).host();
 }
 
 bool TemplateURL::IsExtensionKeyword() const {
   return GURL(url_.url()).SchemeIs(chrome::kExtensionScheme);
 }