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

 // Copyright (c) 2012 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/one_click_signin_view_controller.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #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"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 // The margin between the top edge of the border and the error message text in
@@ skipping 47 matching lines @@
   if (isSyncDialog_ && !startSyncCallback_.is_null()) {
     base::ResetAndReturn(&startSyncCallback_).Run(
         OneClickSigninSyncStarter::UNDO_SYNC);
   }
 }
 
 - (IBAction)ok:(id)sender {
   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);
   }
   [self close];
 }
 
 - (IBAction)onClickUndo:(id)sender {
   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);
   }
   [self close];
 }
 
 - (IBAction)onClickAdvancedLink:(id)sender {
   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);
   }
   else {
     content::OpenURLParams params(GURL(chrome::kChromeUISettingsURL),
                                   content::Referrer(), CURRENT_TAB,
                                   ui::PAGE_TRANSITION_LINK, false);
     webContents_->OpenURL(params);
   }
   [self close];
 }
 
 - (IBAction)onClickClose:(id)sender {
   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);
   }
   [self close];
 }
 
 - (void)awakeFromNib {
   // Lay out the text controls from the bottom up.
   CGFloat totalYOffset = 0.0;
@@ skipping 65 matching lines @@
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:[closeButton_ superview]];
   }
 
   // Resize bubble and window to hold the controls.
   [GTMUILocalizerAndLayoutTweaker
       resizeViewWithoutAutoResizingSubViews:[self view]
                                       delta:delta];
 
   if (isSyncDialog_) {
     OneClickSigninHelper::LogConfirmHistogramValue(
-        one_click_signin::HISTOGRAM_CONFIRM_SHOWN);
+        signin_metrics::HISTOGRAM_CONFIRM_SHOWN);
   }
 }
 
 - (CGFloat)initializeInformativeTextView {
   NSRect oldFrame = [informativePlaceholderTextField_ frame];
 
   // Replace the placeholder NSTextField with the real label NSTextView. The
   // former doesn't show links in a nice way, but the latter can't be added in
   // a xib without a containing scroll view, so create the NSTextView
   // programmatically.
@@ skipping 53 matching lines @@
   return NSHeight(newFrame) - NSHeight(oldFrame);
 }
 
 - (BOOL)textView:(NSTextView*)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   if (isSyncDialog_ && !clickedLearnMore_) {
     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;
   content::OpenURLParams params(GURL(chrome::kChromeSyncLearnMoreURL),
                                 content::Referrer(), location,
                                 ui::PAGE_TRANSITION_LINK, false);
   webContents_->OpenURL(params);
   return YES;
 }
 
 - (void)close {
   base::ResetAndReturn(&closeCallback_).Run();
 }
 
 @end