Update policy backend and testserver for the newest policy protocol

chrome/browser/policy/device_token_fetcher_unittest.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/device_token_fetcher.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/policy/cloud_policy_cache.h"
 #include "chrome/browser/policy/device_management_service.h"
+#include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/mock_device_management_backend.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 const char kTestToken[] = "device_token_fetcher_test_auth_token";
 
@@ skipping 54 matching lines @@
                                        request, delegate);
   }
   virtual void ProcessPolicyRequest(
       const std::string& device_management_token,
       const std::string& device_id,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate) {
     backend_->ProcessPolicyRequest(device_management_token, device_id,
                                    request, delegate);
   }
-  virtual void ProcessCloudPolicyRequest(
-      const std::string& device_management_token,
-      const std::string& device_id,
-      const em::CloudPolicyRequest& request,
-      DevicePolicyResponseDelegate* delegate) {
-    backend_->ProcessCloudPolicyRequest(device_management_token, device_id,
-                                        request, delegate);
-  }
 
  private:
   DeviceManagementBackend* backend_;  // weak
   DISALLOW_COPY_AND_ASSIGN(ProxyDeviceManagementBackend);
 };
 
 DeviceManagementBackend*
     MockDeviceManagementService::CreateBackend()  {
   return new ProxyDeviceManagementBackend(backend_);
 }
@@ skipping 29 matching lines @@
 
 TEST_F(DeviceTokenFetcherTest, FetchToken) {
   testing::InSequence s;
   EXPECT_CALL(backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendSucceedRegister());
   DeviceTokenFetcher fetcher(&service_, cache_.get());
   MockTokenAvailableObserver observer;
   EXPECT_CALL(observer, OnDeviceTokenAvailable());
   fetcher.AddObserver(&observer);
   EXPECT_EQ("", fetcher.GetDeviceToken());
-  fetcher.FetchToken("fake_auth_token", "fake_device_id");
+  fetcher.FetchToken("fake_auth_token", "fake_device_id",
+                     em::DeviceRegisterRequest::USER, "fake_machine_id");
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
   std::string token = fetcher.GetDeviceToken();
   EXPECT_NE("", token);
 
   // Calling FetchToken() again should result in a new token being fetched.
   EXPECT_CALL(backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendSucceedRegister());
   EXPECT_CALL(observer, OnDeviceTokenAvailable());
-  fetcher.FetchToken("fake_auth_token", "fake_device_id");
+  fetcher.FetchToken("fake_auth_token", "fake_device_id",
+                     em::DeviceRegisterRequest::USER, "fake_machine_id");
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
   std::string token2 = fetcher.GetDeviceToken();
   EXPECT_NE("", token2);
   EXPECT_NE(token, token2);
   fetcher.RemoveObserver(&observer);
 }
 
 TEST_F(DeviceTokenFetcherTest, RetryOnError) {
   testing::InSequence s;
   EXPECT_CALL(backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendFailRegister(
           DeviceManagementBackend::kErrorRequestFailed)).WillOnce(
       MockDeviceManagementBackendSucceedRegister());
   DeviceTokenFetcher fetcher(&service_, cache_.get(), 0, 0);
   MockTokenAvailableObserver observer;
   EXPECT_CALL(observer, OnDeviceTokenAvailable());
   fetcher.AddObserver(&observer);
-  fetcher.FetchToken("fake_auth_token", "fake_device_id");
+  fetcher.FetchToken("fake_auth_token", "fake_device_id",
+                     em::DeviceRegisterRequest::USER, "fake_machine_id");
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_NE("", fetcher.GetDeviceToken());
   fetcher.RemoveObserver(&observer);
 }
 
 TEST_F(DeviceTokenFetcherTest, UnmanagedDevice) {
   EXPECT_CALL(backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
       MockDeviceManagementBackendFailRegister(
           DeviceManagementBackend::kErrorServiceManagementNotSupported));
   EXPECT_FALSE(cache_->is_unmanaged());
   DeviceTokenFetcher fetcher(&service_, cache_.get());
   MockTokenAvailableObserver observer;
   EXPECT_CALL(observer, OnDeviceTokenAvailable()).Times(0);
   fetcher.AddObserver(&observer);
-  fetcher.FetchToken("fake_auth_token", "fake_device_id");
+  fetcher.FetchToken("fake_auth_token", "fake_device_id",
+                     em::DeviceRegisterRequest::USER, "fake_machine_id");
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ("", fetcher.GetDeviceToken());
   EXPECT_TRUE(cache_->is_unmanaged());
   fetcher.RemoveObserver(&observer);
 }
 
 }  // namespace policy