chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.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/user_cloud_external_data_manager_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/power_policy_browsertest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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	6

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

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

9 #include "base/file_util.h"

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

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

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

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

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

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

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

16 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h"	16 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h"

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

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

19 #include "chrome/browser/policy/profile_policy_connector.h"	19 #include "chrome/browser/policy/profile_policy_connector.h"

20 #include "chrome/browser/policy/profile_policy_connector_factory.h"	20 #include "chrome/browser/policy/profile_policy_connector_factory.h"

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 &test::ExternalDataFetchCallback,	92 &test::ExternalDataFetchCallback,

93 &fetched_external_data,	93 &fetched_external_data,

94 run_loop.QuitClosure()));	94 run_loop.QuitClosure()));

95 run_loop.Run();	95 run_loop.Run();

96	96

97 ASSERT_TRUE(fetched_external_data);	97 ASSERT_TRUE(fetched_external_data);

98 EXPECT_EQ(external_data, *fetched_external_data);	98 EXPECT_EQ(external_data, *fetched_external_data);

99 }	99 }

100	100

101 } // namespace policy	101 } // namespace policy

OLD	NEW