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

chrome/browser/ui/cocoa/bookmarks/bookmark_button.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_button.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
+
+using content::UserMetricsAction;
 
 // The opacity of the bookmark button drag image.
 static const CGFloat kDragImageOpacity = 0.7;
 
 
 namespace bookmark_button {
 
 NSString* const kPulseBookmarkButtonNotification =
     @"PulseBookmarkButtonNotification";
 NSString* const kBookmarkKey = @"BookmarkKey";
@@ skipping 162 matching lines @@
     NSWindow* window = [[self delegate] browserWindow];
     visibilityDelegate_ =
         [BrowserWindowController browserWindowControllerForWindow:window];
     [visibilityDelegate_ lockBarVisibilityForOwner:self
                                      withAnimation:NO
                                              delay:NO];
   }
   const BookmarkNode* node = [self bookmarkNode];
   const BookmarkNode* parent = node ? node->parent() : NULL;
   if (parent && parent->type() == BookmarkNode::FOLDER) {
-    UserMetrics::RecordAction(UserMetricsAction("BookmarkBarFolder_DragStart"));
+    content::RecordAction(UserMetricsAction("BookmarkBarFolder_DragStart"));
   } else {
-    UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragStart"));
+    content::RecordAction(UserMetricsAction("BookmarkBar_DragStart"));
   }
 
   dragMouseOffset_ = [self convertPointFromBase:[event locationInWindow]];
   dragPending_ = YES;
   gDraggedButton = self;
 
   CGFloat yAt = [self bounds].size.height;
   NSSize dragOffset = NSMakeSize(0.0, 0.0);
   NSImage* image = [self dragImage];
   [self setHidden:YES];
@@ skipping 217 matching lines @@
   [image drawAtPoint:NSMakePoint(0, 0)
             fromRect:NSMakeRect(0, 0, NSWidth(bounds), NSHeight(bounds))
            operation:NSCompositeSourceOver
             fraction:kDragImageOpacity];
 
   [dragImage unlockFocus];
   return dragImage;
 }
 
 @end  // @implementation BookmarkButton(Private)