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

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_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/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/mac_util.h"
 #include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/accelerators/accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 
+using content::UserMetricsAction;
+
 @interface WrenchMenuController (Private)
 - (void)createModel;
 - (void)adjustPositioning;
 - (void)performCommandDispatch:(NSNumber*)tag;
 - (NSButton*)zoomDisplay;
 - (void)removeAllItems:(NSMenu*)menu;
 @end
 
 namespace WrenchMenuControllerInternal {
 
@@ skipping 118 matching lines @@
                              bookmarkMenu));
 }
 
 - (void)menuWillOpen:(NSMenu*)menu {
   [super menuWillOpen:menu];
 
   NSString* title = base::SysUTF16ToNSString(
       [self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));
   [[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]
       setTitle:title];
-  UserMetrics::RecordAction(UserMetricsAction("ShowAppMenu"));
+  content::RecordAction(UserMetricsAction("ShowAppMenu"));
 
   NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ?
       [NSImage imageNamed:NSImageNameExitFullScreenTemplate] :
           [NSImage imageNamed:NSImageNameEnterFullScreenTemplate];
   [[buttonViewController_ zoomFullScreen] setImage:icon];
 }
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   // First empty out the menu and create a new model.
   [self removeAllItems:menu];
@@ skipping 141 matching lines @@
     controller_ = controller;
   }
   return self;
 }
 
 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
   [controller_ dispatchWrenchMenuCommand:sender];
 }
 
 @end  // @implementation WrenchMenuButtonViewController