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

chrome/browser/ui/views/importer/import_lock_dialog_view.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/views/importer/import_lock_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
+using content::UserMetricsAction;
+
 // Default size of the dialog window.
 static const int kDefaultWindowWidth = 320;
 static const int kDefaultWindowHeight = 100;
 
 namespace importer {
 
 void ShowImportLockDialog(gfx::NativeWindow parent,
                           ImporterHost* importer_host) {
   ImportLockDialogView::Show(parent, importer_host);
-  UserMetrics::RecordAction(UserMetricsAction("ImportLockDialogView_Shown"));
+  content::RecordAction(UserMetricsAction("ImportLockDialogView_Shown"));
 }
 
 }  // namespace importer
 
 // static
 void ImportLockDialogView::Show(gfx::NativeWindow parent,
                                 ImporterHost* importer_host) {
   views::Widget::CreateWindow(new ImportLockDialogView(importer_host))->Show();
 }
 
@@ skipping 53 matching lines @@
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ImporterHost::OnImportLockDialogEnd,
                  importer_host_.get(), false));
   return true;
 }
 
 views::View* ImportLockDialogView::GetContentsView() {
   return this;
 }