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

Side by Side Diff: chrome/browser/chromeos/file_manager/zip_file_creator_browsertest.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 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/file_manager/zip_file_creator.h" 5 #include "chrome/browser/chromeos/file_manager/zip_file_creator.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/rand_util.h" 13 #include "base/rand_util.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
16 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/zlib/google/zip_reader.h" 18 #include "third_party/zlib/google/zip_reader.h"
19 19
20 namespace file_manager { 20 namespace file_manager {
21 21
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 EXPECT_TRUE(reader.ExtractCurrentEntryToFilePath(out)); 114 EXPECT_TRUE(reader.ExtractCurrentEntryToFilePath(out));
115 EXPECT_TRUE(base::ContentsEqual(zip_base_dir().Append(kFile2), out)); 115 EXPECT_TRUE(base::ContentsEqual(zip_base_dir().Append(kFile2), out));
116 } else { 116 } else {
117 ADD_FAILURE(); 117 ADD_FAILURE();
118 } 118 }
119 ASSERT_TRUE(reader.AdvanceToNextEntry()); 119 ASSERT_TRUE(reader.AdvanceToNextEntry());
120 } 120 }
121 } 121 }
122 122
123 } // namespace file_manager 123 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/file_manager/file_watcher_unittest.cc ('k') | chrome/browser/chromeos/imageburner/burn_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698