chrome/browser/chromeos/policy/cloud_external_data_policy_observer_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/policy/cloud_external_data_policy_observer_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, 4 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/mobile_config.cc ('k') | chrome/browser/chromeos/policy/device_local_account_browsertest.cc » ('j') | no next file with comments »

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 "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"	5 #include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"

6	6

7 #include <utility>	7 #include <utility>

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/json/json_writer.h"	12 #include "base/json/json_writer.h"

13 #include "base/memory/ref_counted.h"	13 #include "base/memory/ref_counted.h"

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

15 #include "base/message_loop/message_loop_proxy.h"	15 #include "base/message_loop/message_loop_proxy.h"

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

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

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

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

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

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

(...skipping 911 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
933	933

934 EXPECT_TRUE(set_calls_.empty());	934 EXPECT_TRUE(set_calls_.empty());

935 EXPECT_TRUE(cleared_calls_.empty());	935 EXPECT_TRUE(cleared_calls_.empty());

936 ASSERT_EQ(1u, fetched_calls_.size());	936 ASSERT_EQ(1u, fetched_calls_.size());

937 EXPECT_EQ(kRegularUserID, fetched_calls_.front().first);	937 EXPECT_EQ(kRegularUserID, fetched_calls_.front().first);

938 EXPECT_EQ(avatar_policy_2_data_, fetched_calls_.front().second);	938 EXPECT_EQ(avatar_policy_2_data_, fetched_calls_.front().second);

939 ClearObservations();	939 ClearObservations();

940 }	940 }

941	941

942 } // namespace policy	942 } // namespace policy

OLD	NEW