Add new version of enrollment screen supporting OAuth.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2011 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 "chrome/browser/policy/browser_policy_connector.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
@@ skipping 82 matching lines @@
   return recommended_platform_provider_.get();
 }
 
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetRecommendedCloudProvider() const {
   return recommended_cloud_provider_.get();
 }
 
 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
 }
 
 bool BrowserPolicyConnector::IsEnterpriseManaged() {
 #if defined(OS_CHROMEOS)
   return install_attributes_.get() && install_attributes_->IsEnterpriseDevice();
 #else
   return false;
 #endif
@@ skipping 257 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return new DummyConfigurationPolicyProvider(policy_list);
   }
 #else
   return new DummyConfigurationPolicyProvider(policy_list);
 #endif
 }
 
 }  // namespace