Clean up straggler classes to use embedded signin in page in the new profiles world.

chrome/browser/ui/cocoa/one_click_signin_view_controller.mm

Index: chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
index 09f26233800f17e75c67c3fe56fb212ad00f3224..26c7c4eb5e68e5ff7c6c18b0e42f4dad80f31022 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
@@ -9,10 +9,10 @@
 #include "base/mac/bundle_locations.h"
 #import "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
-#include "chrome/browser/ui/sync/one_click_signin_histogram.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/signin/core/browser/signin_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_strings.h"
 #include "skia/ext/skia_utils_mac.h"
@@ -80,8 +80,8 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
         clickedLearnMore_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
-            one_click_signin::HISTOGRAM_CONFIRM_OK);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
+            signin_metrics::HISTOGRAM_CONFIRM_OK);
 
     base::ResetAndReturn(&startSyncCallback_).Run(
       OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
@@ -93,8 +93,8 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
         clickedLearnMore_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_UNDO :
-            one_click_signin::HISTOGRAM_CONFIRM_UNDO);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_UNDO :
+            signin_metrics::HISTOGRAM_CONFIRM_UNDO);
 
     base::ResetAndReturn(&startSyncCallback_).Run(
       OneClickSigninSyncStarter::UNDO_SYNC);
@@ -106,8 +106,8 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
         clickedLearnMore_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_ADVANCED :
-            one_click_signin::HISTOGRAM_CONFIRM_ADVANCED);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_ADVANCED :
+            signin_metrics::HISTOGRAM_CONFIRM_ADVANCED);
 
     base::ResetAndReturn(&startSyncCallback_).Run(
         OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
@@ -125,8 +125,8 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
         clickedLearnMore_ ?
-            one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE_CLOSE :
-            one_click_signin::HISTOGRAM_CONFIRM_CLOSE);
+            signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_CLOSE :
+            signin_metrics::HISTOGRAM_CONFIRM_CLOSE);
 
     base::ResetAndReturn(&startSyncCallback_).Run(
         OneClickSigninSyncStarter::UNDO_SYNC);
@@ -212,7 +212,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
 
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
-        one_click_signin::HISTOGRAM_CONFIRM_SHOWN);
+        signin_metrics::HISTOGRAM_CONFIRM_SHOWN);
   }
 }
 
@@ -286,7 +286,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
     clickedLearnMore_ = YES;
 
     OneClickSigninHelper::LogConfirmHistogramValue(
-        one_click_signin::HISTOGRAM_CONFIRM_LEARN_MORE);
+        signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE);
   }
   WindowOpenDisposition location = isSyncDialog_ ?
                                    NEW_WINDOW : NEW_FOREGROUND_TAB;