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

Side by Side Diff: chrome/browser/chromeos/policy/power_policy_browsertest.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/enterprise_install_attributes_unittest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.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 <string>	5 #include <string>

6 #include <vector>	6 #include <vector>

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/callback.h"	10 #include "base/callback.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

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

13 #include "base/file_util.h"

14 #include "base/files/file_path.h"	13 #include "base/files/file_path.h"

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

15 #include "base/location.h"	15 #include "base/location.h"

16 #include "base/message_loop/message_loop.h"	16 #include "base/message_loop/message_loop.h"

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

18 #include "base/run_loop.h"	18 #include "base/run_loop.h"

19 #include "chrome/browser/chrome_notification_types.h"	19 #include "chrome/browser/chrome_notification_types.h"

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

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

22 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"	22 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"

23 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"	23 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

24 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"	24 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"

(...skipping 480 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
505 policy = baseline_policy;	505 policy = baseline_policy;

506 policy.set_ac_idle_action(power_manager_client_->policy().ac_idle_action());	506 policy.set_ac_idle_action(power_manager_client_->policy().ac_idle_action());

507 policy.set_battery_idle_action(	507 policy.set_battery_idle_action(

508 power_manager_client_->policy().battery_idle_action());	508 power_manager_client_->policy().battery_idle_action());

509 policy.set_reason(power_manager_client_->policy().reason());	509 policy.set_reason(power_manager_client_->policy().reason());

510 EXPECT_EQ(GetDebugString(policy),	510 EXPECT_EQ(GetDebugString(policy),

511 GetDebugString(power_manager_client_->policy()));	511 GetDebugString(power_manager_client_->policy()));

512 }	512 }

513	513

514 } // namespace policy	514 } // namespace policy

OLD	NEW