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

chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_TOKEN_FETCHER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_TOKEN_FETCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
         const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) = 0;
     virtual void OnOAuth2TokensFetchFailed() = 0;
   };
 
   OAuth2TokenFetcher(OAuth2TokenFetcher::Delegate* delegate,
                      net::URLRequestContextGetter* context_getter);
   ~OAuth2TokenFetcher() override;
 
   void StartExchangeFromCookies(const std::string& session_index,
                                 const std::string& signin_scoped_device_id);
-  void StartExchangeFromAuthCode(const std::string& auth_code);
+  void StartExchangeFromAuthCode(const std::string& auth_code,
+                                 const std::string& signin_scoped_device_id);
 
  private:
   // Decides how to proceed on GAIA |error|. If the error looks temporary,
   // retries |task| until max retry count is reached.
   // If retry count runs out, or error condition is unrecoverable, it runs
   // |error_handler|.
   void RetryOnError(const GoogleServiceAuthError& error,
                     const base::Closure& task,
                     const base::Closure& error_handler);
 
@@ skipping 11 matching lines @@
   std::string session_index_;
   std::string signin_scoped_device_id_;
   std::string auth_code_;
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2TokenFetcher);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_OAUTH2_TOKEN_FETCHER_H_