Add new version of enrollment screen supporting OAuth.

chrome/browser/policy/browser_policy_connector.cc

Index: chrome/browser/policy/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 05eb972eb729927e307bf5c4961f360d7c542366..307263a0dab46fa4a07f051013f0d2526f52cb9f 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -100,11 +100,15 @@ ConfigurationPolicyProvider*
 
 void BrowserPolicyConnector::SetDeviceCredentials(
     const std::string& owner_email,
-    const std::string& gaia_token) {
+    const std::string& gaia_token,
+    const std::string& oauth_token) {
 #if defined(OS_CHROMEOS)
   if (device_data_store_.get()) {
     device_data_store_->set_user_name(owner_email);
-    device_data_store_->SetGaiaToken(gaia_token);
+    if (!oauth_token.empty())
+      device_data_store_->SetOAuthToken(oauth_token);
+    else
+      device_data_store_->SetGaiaToken(gaia_token);
   }
 #endif
 }