Cleanups to the policy code.

chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

 // Copyright (c) 2012 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/chromeos/policy/device_local_account_policy_service.h"
 
+#include <algorithm>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 17 matching lines @@
 #include "components/policy/core/common/cloud/policy_builder.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/mock_configuration_policy_provider.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/schema_registry.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "policy/policy_constants.h"
 #include "policy/proto/cloud_policy.pb.h"
+#include "policy/proto/device_management_backend.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::AnyNumber;
 using testing::AtLeast;
 using testing::Mock;
 using testing::SaveArg;
 using testing::_;
 
 namespace em = enterprise_management;
 
@@ skipping 361 matching lines @@
   EXPECT_TRUE(request.has_policy_request());
   ASSERT_EQ(2, request.policy_request().request_size());
 
   const em::PolicyFetchRequest* public_account =
       &request.policy_request().request(0);
   const em::PolicyFetchRequest* extensions =
       &request.policy_request().request(1);
   // The order is not guarateed.
   if (extensions->policy_type() ==
       dm_protocol::kChromePublicAccountPolicyType) {
-    const em::PolicyFetchRequest* tmp = public_account;
-    public_account = extensions;
-    extensions = tmp;
+    std::swap(public_account, extensions);
   }
 
   EXPECT_EQ(dm_protocol::kChromePublicAccountPolicyType,
             public_account->policy_type());
   EXPECT_FALSE(public_account->has_machine_id());
   EXPECT_EQ(kAccount1, public_account->settings_entity_id());
 
   EXPECT_EQ(dm_protocol::kChromeExtensionPolicyType,
             extensions->policy_type());
   EXPECT_FALSE(extensions->has_machine_id());
@@ skipping 527 matching lines @@
   em::DeviceManagementResponse response;
   device_local_account_policy_.Build();
   response.mutable_policy_response()->add_response()->CopyFrom(
       device_local_account_policy_.policy());
   request_job->SendResponse(DM_STATUS_SUCCESS, response);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 }
 
 }  // namespace policy