Pass Device ID in the oauth2/token request. Keep Device ID in local state on Chrome OS.

chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc

Index: chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc b/chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc
index c0bcbc98e1f80706ab1c7d2e6309bb12681dca38..953c5d584357f1fe77ee37c179d6f0374ebc8bc9 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_token_initializer.cc
@@ -21,7 +21,10 @@ void OAuth2TokenInitializer::Start(const UserContext& user_context,
   user_context_ = user_context;
   oauth2_token_fetcher_.reset(new OAuth2TokenFetcher(
       this, g_browser_process->system_request_context()));
-  oauth2_token_fetcher_->StartExchangeFromAuthCode(user_context.GetAuthCode());
+  if (user_context.GetDeviceId().empty())
+    NOTREACHED() << "Device ID is not set";

[xiyuan, 2015/05/13 01:18:02]

NOTREACHED() does not do much for ChromeOS. Most of the time, we don't have
access to chrome logs for failures. If we don't allow empty device id, we should
CHECK or LOG(FATAL) to get crash report.

[dzhioev (left Google), 2015/05/14 23:50:52]

That should never happen in theory. But it is not a critical error, that is why
don't want use CHECK here.
NOTREACHED() will fail in Debug tests. In Release it'll produce error message.
That is what I want.

+  oauth2_token_fetcher_->StartExchangeFromAuthCode(user_context.GetAuthCode(),
+                                                   user_context.GetDeviceId());
 }
 
 void OAuth2TokenInitializer::OnOAuth2TokensAvailable(