chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_cros_browser_test.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('k') | chrome/browser/chromeos/policy/enterprise_install_attributes.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"	5 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/file_util.h"

11 #include "base/files/file_path.h"	10 #include "base/files/file_path.h"

	11 #include "base/files/file_util.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/stl_util.h"	13 #include "base/stl_util.h"

14 #include "chrome/browser/chromeos/policy/device_policy_builder.h"	14 #include "chrome/browser/chromeos/policy/device_policy_builder.h"

15 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"	15 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

16 #include "chrome/common/chrome_paths.h"	16 #include "chrome/common/chrome_paths.h"

17 #include "chromeos/chromeos_paths.h"	17 #include "chromeos/chromeos_paths.h"

18 #include "chromeos/dbus/fake_dbus_thread_manager.h"	18 #include "chromeos/dbus/fake_dbus_thread_manager.h"

19 #include "chromeos/dbus/fake_session_manager_client.h"	19 #include "chromeos/dbus/fake_session_manager_client.h"

20 #include "crypto/rsa_private_key.h"	20 #include "crypto/rsa_private_key.h"

21 #include "testing/gmock/include/gmock/gmock.h"	21 #include "testing/gmock/include/gmock/gmock.h"

(...skipping 80 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102	102

103 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() {	103 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() {

104 // Reset the key to its original state.	104 // Reset the key to its original state.

105 device_policy()->SetDefaultSigningKey();	105 device_policy()->SetDefaultSigningKey();

106 device_policy()->Build();	106 device_policy()->Build();

107 session_manager_client()->set_device_policy(device_policy()->GetBlob());	107 session_manager_client()->set_device_policy(device_policy()->GetBlob());

108 session_manager_client()->OnPropertyChangeComplete(true);	108 session_manager_client()->OnPropertyChangeComplete(true);

109 }	109 }

110	110

111 } // namespace policy	111 } // namespace policy

OLD	NEW