Implementation of SigninClient::GetSigninScopedDeviceId

components/signin/core/browser/signin_oauth_helper.cc

Index: components/signin/core/browser/signin_oauth_helper.cc
diff --git a/components/signin/core/browser/signin_oauth_helper.cc b/components/signin/core/browser/signin_oauth_helper.cc
index cfe7ce74da56d96da8565152d5e56cc9cd6365ba..a5c9780bf3660b69cf79d374b3ee86703e0d0cf3 100644
--- a/components/signin/core/browser/signin_oauth_helper.cc
+++ b/components/signin/core/browser/signin_oauth_helper.cc
@@ -4,7 +4,9 @@
 
 #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"
 
@@ -17,8 +19,13 @@ SigninOAuthHelper::SigninOAuthHelper(net::URLRequestContextGetter* getter,
   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() {}