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

Side by Side Diff: chrome/browser/chromeos/drive/file_system/open_file_operation_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 "chrome/browser/chromeos/drive/file_system/open_file_operation.h" 5 #include "chrome/browser/chromeos/drive/file_system/open_file_operation.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/task_runner_util.h" 12 #include "base/task_runner_util.h"
13 #include "chrome/browser/chromeos/drive/drive.pb.h" 13 #include "chrome/browser/chromeos/drive/drive.pb.h"
14 #include "chrome/browser/chromeos/drive/file_cache.h" 14 #include "chrome/browser/chromeos/drive/file_cache.h"
15 #include "chrome/browser/chromeos/drive/file_change.h" 15 #include "chrome/browser/chromeos/drive/file_change.h"
16 #include "chrome/browser/chromeos/drive/file_errors.h" 16 #include "chrome/browser/chromeos/drive/file_errors.h"
17 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" 17 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
18 #include "content/public/test/test_utils.h" 18 #include "content/public/test/test_utils.h"
19 #include "google_apis/drive/test_util.h" 19 #include "google_apis/drive/test_util.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 EXPECT_TRUE(delegate()->updated_local_ids().empty()); 248 EXPECT_TRUE(delegate()->updated_local_ids().empty());
249 249
250 close_callback2.Run(); 250 close_callback2.Run();
251 251
252 // Here, all the clients close the file, so it should be uploaded then. 252 // Here, all the clients close the file, so it should be uploaded then.
253 EXPECT_EQ(1U, delegate()->updated_local_ids().count(src_entry.local_id())); 253 EXPECT_EQ(1U, delegate()->updated_local_ids().count(src_entry.local_id()));
254 } 254 }
255 255
256 } // namespace file_system 256 } // namespace file_system
257 } // namespace drive 257 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698