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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h

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
OLDNEW
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 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ 5 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_
6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ 6 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/drive/drive_uploader.h" 13 #include "chrome/browser/drive/drive_uploader.h"
14 #include "chrome/browser/drive/fake_drive_service.h" 14 #include "chrome/browser/drive/fake_drive_service.h"
15 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h" 15 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"
16 #include "google_apis/drive/gdata_errorcode.h" 16 #include "google_apis/drive/gdata_errorcode.h"
17 #include "google_apis/drive/test_util.h" 17 #include "google_apis/drive/test_util.h"
18 #include "net/base/escape.h" 18 #include "net/base/escape.h"
19 19
20 namespace sync_file_system { 20 namespace sync_file_system {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 FakeDriveServiceWrapper* fake_drive_service_; 80 FakeDriveServiceWrapper* fake_drive_service_;
81 bool make_file_conflict_; 81 bool make_file_conflict_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(FakeDriveUploader); 83 DISALLOW_COPY_AND_ASSIGN(FakeDriveUploader);
84 }; 84 };
85 85
86 } // namespace drive_backend 86 } // namespace drive_backend
87 } // namespace sync_file_system 87 } // namespace sync_file_system
88 88
89 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_ 89 #endif // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_FAKE_DRIVE_UPLOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698