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

Side by Side Diff: chrome/utility/image_writer/image_writer_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, 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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "chrome/utility/image_writer/error_messages.h" 10 #include "chrome/utility/image_writer/error_messages.h"
11 #include "chrome/utility/image_writer/image_writer.h" 11 #include "chrome/utility/image_writer/image_writer.h"
12 #include "chrome/utility/image_writer/image_writer_handler.h" 12 #include "chrome/utility/image_writer/image_writer_handler.h"
13 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace image_writer { 16 namespace image_writer {
17 17
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 EXPECT_CALL(mock_handler, SendFailed(_)).Times(0); 221 EXPECT_CALL(mock_handler, SendFailed(_)).Times(0);
222 222
223 FillDefault(image_path_); 223 FillDefault(image_path_);
224 224
225 image_writer.Write(); 225 image_writer.Write();
226 226
227 base::RunLoop().RunUntilIdle(); 227 base::RunLoop().RunUntilIdle();
228 } 228 }
229 229
230 } // namespace image_writer 230 } // namespace image_writer
OLDNEW
« no previous file with comments | « chrome/utility/extensions/unpacker_unittest.cc ('k') | chrome/utility/importer/bookmark_html_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698