Removing branching code for bubble/dialog field trial.

chrome/browser/ui/sync/one_click_signin_helper.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 1089 matching lines @@
       }
     }
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
 
   VLOG(1) << "OneClickSigninHelper::DidStopLoading: signin is go."
           << " auto_accept=" << auto_accept_
           << " source=" << source_;
 
-  const char kSignInToChromeDialogFieldTrialName[] =
-      "SignInToChromeConfirmation";
-  const char kSignInConfirmBubbleGroupName[] = "Bubble";
-  BrowserWindow::OneClickSigninBubbleType bubble_type;
-  if (base::FieldTrialList::FindFullName(kSignInToChromeDialogFieldTrialName) ==
-      kSignInConfirmBubbleGroupName)
-    bubble_type = BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE;
-  else
-    bubble_type = BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG;
-
   switch (auto_accept_) {
     case AUTO_ACCEPT_NONE:
       if (SyncPromoUI::UseWebBasedSigninFlow() && showing_signin_)
           LogOneClickHistogramValue(one_click_signin::HISTOGRAM_DISMISSED);
       break;
     case AUTO_ACCEPT_ACCEPTED:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_WITH_DEFAULTS);
       SigninManager::DisableOneClickSignIn(profile);
       browser->window()->ShowOneClickSigninBubble(
-          bubble_type,
+          BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_MODAL_DIALOG,
           UTF8ToUTF16(email_),
           string16(), /* no error message to display */
           base::Bind(&StartSync,
                      StartSyncArgs(profile, browser, auto_accept_,
                                    session_index_, email_, password_,
                                    false /* force_same_tab_navigation */,
                                    confirmation_required_)));
       break;
     case AUTO_ACCEPT_CONFIGURE:
       LogOneClickHistogramValue(one_click_signin::HISTOGRAM_ACCEPTED);
@@ skipping 141 matching lines @@
     }
   }
   ShowSyncConfirmationBubble(display_bubble);
   signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   ShowSyncConfirmationBubble(true);
   signin_tracker_.reset();
 }