chrome/browser/sync/test/integration/single_client_backup_rollback_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/sync/test/integration/single_client_backup_rollback_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, 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "base/command_line.h"	5 #include "base/command_line.h"

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

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

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

10 #include "base/test/test_timeouts.h"	10 #include "base/test/test_timeouts.h"

11 #include "chrome/browser/browsing_data/browsing_data_remover.h"	11 #include "chrome/browser/browsing_data/browsing_data_remover.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/sync/profile_sync_service.h"	13 #include "chrome/browser/sync/profile_sync_service.h"

14 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"	14 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"

15 #include "chrome/browser/sync/test/integration/preferences_helper.h"	15 #include "chrome/browser/sync/test/integration/preferences_helper.h"

16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"	16 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

(...skipping 415 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
432 ASSERT_TRUE(rollback_checker.Wait());	432 ASSERT_TRUE(rollback_checker.Wait());

433 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));	433 SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));

434 ASSERT_TRUE(shutdown_checker.Wait());	434 ASSERT_TRUE(shutdown_checker.Wait());

435	435

436 // Verify bookmarks are unchanged.	436 // Verify bookmarks are unchanged.

437 ASSERT_EQ(3, sub_folder->child_count());	437 ASSERT_EQ(3, sub_folder->child_count());

438 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());	438 ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());

439 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());	439 ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());

440 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());	440 ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());

441 }	441 }

OLD	NEW