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

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

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/process/process_handle.h" 10 #include "base/process/process_handle.h"
(...skipping 25 matching lines...) Expand all
36 FFUnitTestDecryptorProxy(); 36 FFUnitTestDecryptorProxy();
37 virtual ~FFUnitTestDecryptorProxy(); 37 virtual ~FFUnitTestDecryptorProxy();
38 38
39 // Initialize a decryptor, returns true if the object was 39 // Initialize a decryptor, returns true if the object was
40 // constructed successfully. 40 // constructed successfully.
41 bool Setup(const base::FilePath& nss_path); 41 bool Setup(const base::FilePath& nss_path);
42 42
43 // This match the parallel functions in NSSDecryptor. 43 // This match the parallel functions in NSSDecryptor.
44 bool DecryptorInit(const base::FilePath& dll_path, 44 bool DecryptorInit(const base::FilePath& dll_path,
45 const base::FilePath& db_path); 45 const base::FilePath& db_path);
46 string16 Decrypt(const std::string& crypt); 46 base::string16 Decrypt(const std::string& crypt);
47 47
48 private: 48 private:
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 // Blocks until either a timeout is reached, or until the client process 50 // Blocks until either a timeout is reached, or until the client process
51 // responds to an IPC message. 51 // responds to an IPC message.
52 // Returns true if a reply was received successfully and false if the 52 // Returns true if a reply was received successfully and false if the
53 // the operation timed out. 53 // the operation timed out.
54 bool WaitForClientResponse(); 54 bool WaitForClientResponse();
55 55
56 base::ProcessHandle child_process_; 56 base::ProcessHandle child_process_;
(...skipping 17 matching lines...) Expand all
74 74
75 bool FFUnitTestDecryptorProxy::Setup(const base::FilePath& nss_path) { 75 bool FFUnitTestDecryptorProxy::Setup(const base::FilePath& nss_path) {
76 return true; 76 return true;
77 } 77 }
78 78
79 bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path, 79 bool FFUnitTestDecryptorProxy::DecryptorInit(const base::FilePath& dll_path,
80 const base::FilePath& db_path) { 80 const base::FilePath& db_path) {
81 return decryptor_.Init(dll_path, db_path); 81 return decryptor_.Init(dll_path, db_path);
82 } 82 }
83 83
84 string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) { 84 base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
85 return decryptor_.Decrypt(crypt); 85 return decryptor_.Decrypt(crypt);
86 } 86 }
87 #endif // !OS_MACOSX 87 #endif // !OS_MACOSX
88 88
89 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_ 89 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_UNITTEST_UTILS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698