Revert of Remove OneClickSigninHelper since it is no longer used.

chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc

Index: chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
index d2e631ffd025fec3ca18d464bbef39b88ce33b98..07baef1c55318d3acda57765fc6ce77ba394684c 100644
--- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
+++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc
@@ -7,6 +7,7 @@
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
@@ -207,7 +208,7 @@
 }
 
 void OneClickSigninBubbleView::InitDialogContent(views::GridLayout* layout) {
-  signin_metrics::LogSigninConfirmHistogramValue(
+  OneClickSigninHelper::LogConfirmHistogramValue(
       signin_metrics::HISTOGRAM_CONFIRM_SHOWN);
 
   // Column set for title bar.
@@ -318,7 +319,7 @@
 
     if (is_sync_dialog_) {
       if (accelerator.key_code() == ui::VKEY_RETURN) {
-        signin_metrics::LogSigninConfirmHistogramValue(
+        OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
             signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_RETURN :
             signin_metrics::HISTOGRAM_CONFIRM_RETURN);
@@ -326,7 +327,7 @@
         base::ResetAndReturn(&start_sync_callback_).Run(
             OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS);
       } else if (accelerator.key_code() == ui::VKEY_ESCAPE) {
-        signin_metrics::LogSigninConfirmHistogramValue(
+        OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
             signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_ESCAPE :
             signin_metrics::HISTOGRAM_CONFIRM_ESCAPE);
@@ -346,7 +347,7 @@
                                            int event_flags) {
   if (source == learn_more_link_) {
     if (is_sync_dialog_ && !clicked_learn_more_) {
-      signin_metrics::LogSigninConfirmHistogramValue(
+      OneClickSigninHelper::LogConfirmHistogramValue(
           signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE);
       clicked_learn_more_ = true;
     }
@@ -357,7 +358,7 @@
       return;
   } else if (advanced_link_ && source == advanced_link_) {
     if (is_sync_dialog_) {
-      signin_metrics::LogSigninConfirmHistogramValue(
+      OneClickSigninHelper::LogConfirmHistogramValue(
         clicked_learn_more_ ?
             signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_ADVANCED :
             signin_metrics::HISTOGRAM_CONFIRM_ADVANCED);
@@ -378,19 +379,19 @@
 
   if (is_sync_dialog_) {
     if (sender == ok_button_)
-      signin_metrics::LogSigninConfirmHistogramValue(
+      OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
               signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_OK :
               signin_metrics::HISTOGRAM_CONFIRM_OK);
 
     if (sender == undo_button_)
-      signin_metrics::LogSigninConfirmHistogramValue(
+      OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
               signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_UNDO :
               signin_metrics::HISTOGRAM_CONFIRM_UNDO);
 
     if (sender == close_button_)
-      signin_metrics::LogSigninConfirmHistogramValue(
+      OneClickSigninHelper::LogConfirmHistogramValue(
           clicked_learn_more_ ?
               signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE_CLOSE :
               signin_metrics::HISTOGRAM_CONFIRM_CLOSE);