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

chrome/browser/ui/fullscreen_controller.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/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/user_metrics.h"
+
+using content::UserMetricsAction;
 
 FullscreenController::FullscreenController(BrowserWindow* window,
                                            Profile* profile,
                                            Browser* browser)
   : window_(window),
     profile_(profile),
     browser_(browser),
     fullscreened_tab_(NULL),
     tab_caused_fullscreen_(false),
     tab_fullscreen_accepted_(false),
@@ skipping 129 matching lines @@
       window_->IsFullscreen())
     return;
 #endif
 
   GURL url;
   if (for_tab) {
     url = browser_->GetSelectedTabContents()->GetURL();
     tab_fullscreen_accepted_ = entering_fullscreen &&
         GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
   } else {
-    UserMetrics::RecordAction(UserMetricsAction("ToggleFullscreen"));
+    content::RecordAction(UserMetricsAction("ToggleFullscreen"));
   }
   if (entering_fullscreen)
     window_->EnterFullscreen(url, GetFullscreenExitBubbleType());
   else
     window_->ExitFullscreen();
 
   // Once the window has become fullscreen it'll call back to
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
@@ skipping 166 matching lines @@
 
 ContentSetting
     FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }