chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc - Issue 392233003: Cleanups to the policy code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

Issue 392233003: Cleanups to the policy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_policy_service.cc ('k') | components/policy/core/common/forwarding_policy_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

index 00ea37dc70c30ba71b8dcc4aad3f6d0c55060ff1..d1c2d55968573523ec7e139890a882a414481e93 100644

--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

@@ -4,6 +4,8 @@

#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"

@@ -41,6 +43,7 @@

#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;

@@ -422,9 +425,7 @@ TEST_F(DeviceLocalAccountPolicyServiceTest, FetchPolicy) {

// 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,