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

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_BOOKMARK_MENU
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #include "ui/base/text/text_elider.h"
 
+using content::UserMetricsAction;
+
 namespace {
 
 // Menus more than this many pixels wide will get trimmed
 // TODO(jrg): ask UI dudes what a good value is.
 const NSUInteger kMaximumMenuPixelsWide = 300;
 
 }
 
 @implementation BookmarkMenuCocoaController
 
@@ skipping 80 matching lines @@
     browser = Browser::Create(bridge_->GetProfile());
   DCHECK(browser);
 
   if (!node || !browser)
     return; // shouldn't be reached
 
   bookmark_utils::OpenAll(NULL, browser->profile(), browser, node,
                           disposition);
 
   if (disposition == NEW_FOREGROUND_TAB) {
-    UserMetrics::RecordAction(UserMetricsAction("OpenAllBookmarks"));
+    content::RecordAction(UserMetricsAction("OpenAllBookmarks"));
   } else if (disposition == NEW_WINDOW) {
-    UserMetrics::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow"));
+    content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow"));
   } else {
-    UserMetrics::RecordAction(
+    content::RecordAction(
         UserMetricsAction("OpenAllBookmarksIncognitoWindow"));
   }
 }
 
 - (IBAction)openBookmarkMenuItem:(id)sender {
   NSInteger tag = [sender tag];
   int identifier = tag;
   const BookmarkNode* node = [self nodeForIdentifier:identifier];
   DCHECK(node);
   if (!node)
     return;  // shouldn't be reached
 
   [self openURLForNode:node];
 }
 
 - (IBAction)openAllBookmarks:(id)sender {
   [self openAll:[sender tag] withDisposition:NEW_FOREGROUND_TAB];
 }
 
 - (IBAction)openAllBookmarksNewWindow:(id)sender {
   [self openAll:[sender tag] withDisposition:NEW_WINDOW];
 }
 
 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
   [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
 }
 
 @end  // BookmarkMenuCocoaController