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

Side by Side Diff: chrome/browser/media_galleries/fileapi/picasa_file_util_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 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 <set> 5 #include <set>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.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/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/message_loop/message_loop_proxy.h" 16 #include "base/message_loop/message_loop_proxy.h"
17 #include "base/run_loop.h" 17 #include "base/run_loop.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "base/time/time.h" 19 #include "base/time/time.h"
20 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" 20 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
21 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h" 21 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 operation_runner()->CreateSnapshotFile( 592 operation_runner()->CreateSnapshotFile(
593 CreateURL(std::string(kPicasaDirAlbums) + 593 CreateURL(std::string(kPicasaDirAlbums) +
594 "/albumname 2013-04-16/mapped_name.jpg"), 594 "/albumname 2013-04-16/mapped_name.jpg"),
595 snapshot_callback); 595 snapshot_callback);
596 loop.Run(); 596 loop.Run();
597 EXPECT_EQ(base::File::FILE_OK, error); 597 EXPECT_EQ(base::File::FILE_OK, error);
598 EXPECT_EQ(image_path, platform_path_result); 598 EXPECT_EQ(image_path, platform_path_result);
599 } 599 }
600 600
601 } // namespace picasa 601 } // namespace picasa
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698