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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.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_bar_view.h"
 
 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
 #include "chrome/browser/profiles/profile.h"
+#import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
-#import "chrome/browser/themes/theme_service.h"
-#include "content/browser/user_metrics.h"
+#include "content/public/browser/user_metrics.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 
+using content::UserMetricsAction;
+
 @interface BookmarkBarView (Private)
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 - (void)updateTheme:(ui::ThemeProvider*)themeProvider;
 @end
 
 @implementation BookmarkBarView
 
 @synthesize dropIndicatorShown = dropIndicatorShown_;
 @synthesize dropIndicatorPosition = dropIndicatorPosition_;
 @synthesize noItemContainer = noItemContainer_;
@@ skipping 206 matching lines @@
     const BookmarkNode* const source_node = [button bookmarkNode];
     const BookmarkNode* const target_node =
         model->GetNodeByID(source_node->id());
 
     BOOL copy =
         !([info draggingSourceOperationMask] & NSDragOperationMove) ||
         (source_node != target_node);
     rtn = [controller_ dragButton:button
                                to:[info draggingLocation]
                              copy:copy];
-    UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragEnd"));
+    content::RecordAction(UserMetricsAction("BookmarkBar_DragEnd"));
   }
   return rtn;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
   if ([controller_ dragBookmarkData:info])
     return YES;
   NSPasteboard* pboard = [info draggingPasteboard];
   if ([pboard dataForType:kBookmarkButtonDragType]) {
     if ([self performDragOperationForBookmarkButton:info])
       return YES;
     // Fall through....
   }
   if ([pboard containsURLData]) {
     if ([self performDragOperationForURL:info])
       return YES;
   }
   return NO;
 }
 
 - (void)setController:(id)controller {
   controller_ = controller;
 }
 
 - (ViewID)viewID {
   return VIEW_ID_BOOKMARK_BAR;
 }
 
 @end  // @implementation BookmarkBarView