Update policy backend and testserver for the newest policy protocol

chrome/browser/policy/user_policy_identity_strategy.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/user_policy_identity_strategy.h"
 
 #include "base/file_util.h"
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/net/gaia/token_service.h"
+#include "chrome/browser/policy/proto/device_management_backend.pb.h"
+#include "chrome/browser/policy/proto/device_management_constants.h"
 #include "chrome/browser/policy/proto/device_management_local.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 135 matching lines @@
 UserPolicyIdentityStrategy::~UserPolicyIdentityStrategy() {}
 
 std::string UserPolicyIdentityStrategy::GetDeviceToken() {
   return device_token_;
 }
 
 std::string UserPolicyIdentityStrategy::GetDeviceID() {
   return device_id_;
 }
 
+std::string UserPolicyIdentityStrategy::GetMachineID() {
+  return "";
+}
+
+em::DeviceRegisterRequest_Type
+UserPolicyIdentityStrategy::GetPolicyRegisterType() {
+  return em::DeviceRegisterRequest::USER;
+}
+
+std::string UserPolicyIdentityStrategy::GetPolicyType() {
+  return kChromeUserPolicyType;
+}
+
+
 bool UserPolicyIdentityStrategy::GetCredentials(std::string* username,
                                                 std::string* auth_token) {
   *username = GetCurrentUser();
   *auth_token = profile_->GetTokenService()->GetTokenForService(
       GaiaConstants::kDeviceManagementService);
 
   return !username->empty() && !auth_token->empty() && !device_id_.empty();
 }
 
 void UserPolicyIdentityStrategy::OnDeviceTokenAvailable(
@@ skipping 38 matching lines @@
 
 void UserPolicyIdentityStrategy::Observe(NotificationType type,
                                          const NotificationSource& source,
                                          const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (type == NotificationType::TOKEN_AVAILABLE) {
     if (Source<TokenService>(source).ptr() == profile_->GetTokenService()) {
       const TokenService::TokenAvailableDetails* token_details =
           Details<const TokenService::TokenAvailableDetails>(details).ptr();
       if (token_details->service() == GaiaConstants::kDeviceManagementService)
-        CheckAndTriggerFetch();
+        if (device_token_.empty()) {
+          // Request a new device management server token, but only in case we
+          // don't already have it.
+          CheckAndTriggerFetch();
+        }
     }
 #if defined(OS_CHROMEOS)
   } else if (type == NotificationType::LOGIN_USER_CHANGED) {
     CheckAndTriggerFetch();
 #else
   } else if (type == NotificationType::GOOGLE_SIGNIN_SUCCESSFUL) {
     if (profile_ == Source<Profile>(source).ptr())
       CheckAndTriggerFetch();
 #endif
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace policy