chrome/browser/chromeos/settings/device_settings_provider_unittest.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/settings/device_settings_provider_unittest.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/power/renderer_freezer.cc ('k') | chrome/browser/chromeos/settings/owner_key_util.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/settings/device_settings_provider.h"	5 #include "chrome/browser/chromeos/settings/device_settings_provider.h"

6	6

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

8	8

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

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

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

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

13 #include "base/test/scoped_path_override.h"	13 #include "base/test/scoped_path_override.h"

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"	15 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"

16 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"	16 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"

17 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"	17 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

18 #include "chrome/browser/chromeos/policy/device_local_account.h"	18 #include "chrome/browser/chromeos/policy/device_local_account.h"

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

20 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"	20 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"

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

(...skipping 262 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
284 policy::PolicyBuilder::kFakeUsername);	284 policy::PolicyBuilder::kFakeUsername);

285 entry_dict->SetInteger(kAccountsPrefDeviceLocalAccountsKeyType,	285 entry_dict->SetInteger(kAccountsPrefDeviceLocalAccountsKeyType,

286 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION);	286 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION);

287 expected_accounts.Append(entry_dict.release());	287 expected_accounts.Append(entry_dict.release());

288 const base::Value* actual_accounts =	288 const base::Value* actual_accounts =

289 provider_->Get(kAccountsPrefDeviceLocalAccounts);	289 provider_->Get(kAccountsPrefDeviceLocalAccounts);

290 EXPECT_TRUE(base::Value::Equals(&expected_accounts, actual_accounts));	290 EXPECT_TRUE(base::Value::Equals(&expected_accounts, actual_accounts));

291 }	291 }

292	292

293 } // namespace chromeos	293 } // namespace chromeos

OLD	NEW