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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.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
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 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h" 5 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
12 #include "chrome/browser/drive/drive_api_util.h" 12 #include "chrome/browser/drive/drive_api_util.h"
13 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" 13 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
14 #include "chrome/browser/sync_file_system/sync_status_code.h" 14 #include "chrome/browser/sync_file_system/sync_status_code.h"
15 #include "google_apis/drive/drive_api_parser.h" 15 #include "google_apis/drive/drive_api_parser.h"
16 #include "google_apis/drive/gdata_wapi_parser.h" 16 #include "google_apis/drive/gdata_wapi_parser.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "webkit/browser/fileapi/file_system_url.h" 18 #include "webkit/browser/fileapi/file_system_url.h"
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 const std::string& content) { 345 const std::string& content) {
346 base::FilePath temp_file; 346 base::FilePath temp_file;
347 EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_, &temp_file)); 347 EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_, &temp_file));
348 EXPECT_EQ(static_cast<int>(content.size()), 348 EXPECT_EQ(static_cast<int>(content.size()),
349 base::WriteFile(temp_file, content.data(), content.size())); 349 base::WriteFile(temp_file, content.data(), content.size()));
350 return temp_file; 350 return temp_file;
351 } 351 }
352 352
353 } // namespace drive_backend 353 } // namespace drive_backend
354 } // namespace sync_file_system 354 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698