Implementation of SigninClient::GetSigninScopedDeviceId

components/signin/core/browser/signin_oauth_helper.cc

 // Copyright 2014 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 "components/signin/core/browser/signin_oauth_helper.h"
 
+#include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "components/signin/core/common/signin_switches.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 SigninOAuthHelper::SigninOAuthHelper(net::URLRequestContextGetter* getter,
                                      const std::string& session_index,
                                      const std::string& signin_scoped_device_id,
                                      Consumer* consumer)
     : gaia_auth_fetcher_(this, GaiaConstants::kChromeSource, getter),
       consumer_(consumer) {
   DCHECK(consumer_);
   DCHECK(getter);
   DCHECK(!session_index.empty());
-  gaia_auth_fetcher_.StartCookieForOAuthLoginTokenExchangeWithDeviceId(
-      session_index, signin_scoped_device_id);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableNewProfileManagement)) {

[Roger Tawa OOO till Jul 10th, 2014/07/01 13:42:54]

Please use switches::IsNewProfileManagement() from
components/signin/core/common/profile_management_switches.h instead of this
command line switch directly.

Why do we need to check this here?  Did you mean to use the new command line
flag you added?

[pavely, 2014/07/01 21:41:47]

Sorry, missed the line when copy pasting from switches header. 
The idea is for me to be able to experiment with this code while having the
whole feature disabled by default for everyone until all pieces are ready.
Now that I think about it, the other side effect of this change is pref value in
chrome_signin_client. I'd better put this condition there.

+    gaia_auth_fetcher_.StartCookieForOAuthLoginTokenExchangeWithDeviceId(
+        session_index, signin_scoped_device_id);
+  } else {
+    gaia_auth_fetcher_.StartCookieForOAuthLoginTokenExchange(session_index);
+  }
 }
 
 SigninOAuthHelper::~SigninOAuthHelper() {}
 
 void SigninOAuthHelper::OnClientOAuthSuccess(const ClientOAuthResult& result) {
   refresh_token_ = result.refresh_token;
   gaia_auth_fetcher_.StartOAuthLogin(result.access_token,
                                      GaiaConstants::kGaiaService);
 }
 
@@ skipping 29 matching lines @@
     consumer_->OnSigninOAuthInformationAvailable(
         email_iter->second, display_email_iter->second, refresh_token_);
   }
 }
 
 void SigninOAuthHelper::OnGetUserInfoFailure(
     const GoogleServiceAuthError& error) {
   VLOG(1) << "SigninOAuthHelper::OnGetUserInfoFailure : " << error.ToString();
   consumer_->OnSigninOAuthInformationFailure(error);
 }