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

Side by Side Diff: chrome/utility/importer/firefox_importer_unittest_utils.h

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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_ 5 #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
6 #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_ 6 #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/process/process_handle.h" 11 #include "base/process/process_handle.h"
12 #include "chrome/utility/importer/nss_decryptor.h" 12 #include "chrome/utility/importer/nss_decryptor.h"
13 #include "components/autofill/core/common/password_form.h" 13 #include "components/autofill/core/common/password_form.h"
14 14
15 class FFDecryptorServerChannelListener; 15 class FFDecryptorServerChannelListener;
16 16
17 namespace base { 17 namespace base {
18 class MessageLoopForIO; 18 class MessageLoopForIO;
19 } 19 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 std::vector<autofill::PasswordForm> signons; 94 std::vector<autofill::PasswordForm> signons;
95 if (decryptor_.ReadAndParseSignons(signons_path, &signons)) 95 if (decryptor_.ReadAndParseSignons(signons_path, &signons))
96 return signons; 96 return signons;
97 97
98 return std::vector<autofill::PasswordForm>(); 98 return std::vector<autofill::PasswordForm>();
99 } 99 }
100 100
101 #endif // !OS_MACOSX 101 #endif // !OS_MACOSX
102 102
103 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_ 103 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
OLDNEW
« no previous file with comments | « chrome/utility/importer/firefox_importer.cc ('k') | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698