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

Unified Diff: chrome/browser/importer/firefox_importer_unittest_utils_mac.cc

Issue 10387218: Make GlobalDescriptors::MaybeGet return -1 when the key is not found. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modifying the MULTIPROCESS_TEST_MAIN macro so it can be passed a setup method. Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
index d609cc96e539b487bca9685851ae54836381291e..c4ac0a2094118b1704147d3947774aeea4664e34 100644
--- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
+++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/global_descriptors_posix.h"
#include "base/message_loop.h"
#include "base/test/test_timeouts.h"
#include "chrome/browser/importer/firefox_importer_utils.h"
@@ -16,6 +17,7 @@
#include "ipc/ipc_descriptors.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_switches.h"
+#include "ipc/ipc_tests.h"
#include "testing/multiprocess_func_list.h"
#define IPC_MESSAGE_IMPL
@@ -263,7 +265,7 @@ class FFDecryptorClientChannelListener : public IPC::Channel::Listener {
};
// Entry function in child process.
-MULTIPROCESS_TEST_MAIN(NSSDecrypterChildProcess) {
+MULTIPROCESS_TEST_MAIN(NSSDecrypterChildProcess, MultiProcessTestIPCSetUp) {
MessageLoopForIO main_message_loop;
FFDecryptorClientChannelListener listener;

Powered by Google App Engine
This is Rietveld 408576698