Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Side by Side Diff: chrome/browser/sync_file_system/local/local_file_sync_service_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
OLDNEW
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 <vector> 5 #include <vector>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "chrome/browser/sync_file_system/file_change.h" 15 #include "chrome/browser/sync_file_system/file_change.h"
16 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h" 16 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"
17 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h" 17 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"
18 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h" 18 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
19 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" 19 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 all_origins.insert(kOrigin2); 726 all_origins.insert(kOrigin2);
727 all_origins.insert(kOrigin3); 727 all_origins.insert(kOrigin3);
728 while (!all_origins.empty()) { 728 while (!all_origins.empty()) {
729 ASSERT_TRUE(NextOriginToProcess(&origin)); 729 ASSERT_TRUE(NextOriginToProcess(&origin));
730 ASSERT_TRUE(ContainsKey(all_origins, origin)); 730 ASSERT_TRUE(ContainsKey(all_origins, origin));
731 all_origins.erase(origin); 731 all_origins.erase(origin);
732 } 732 }
733 } 733 }
734 734
735 } // namespace sync_file_system 735 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698