Index: content/test/test_launcher.cc |
=================================================================== |
--- content/test/test_launcher.cc (revision 107845) |
+++ content/test/test_launcher.cc (working copy) |
@@ -12,7 +12,6 @@ |
#include "base/file_util.h" |
#include "base/hash_tables.h" |
#include "base/logging.h" |
-#include "base/mac/scoped_nsautorelease_pool.h" |
#include "base/memory/linked_ptr.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/process_util.h" |
@@ -33,6 +32,8 @@ |
#include "sandbox/src/dep.h" |
#include "sandbox/src/sandbox_factory.h" |
#include "sandbox/src/sandbox_types.h" |
+#elif defined(OS_MACOSX) |
+#include "base/mac/scoped_nsautorelease_pool.h" |
#endif |
namespace test_launcher { |
@@ -302,9 +303,11 @@ |
int RunTest(TestLauncherDelegate* launcher_delegate, |
const std::string& test_name, |
int default_timeout_ms) { |
+#if defined(OS_MACOSXS) |
// Some of the below method calls will leak objects if there is no |
// autorelease pool in place. |
base::mac::ScopedNSAutoreleasePool pool; |
+#endif |
const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
CommandLine new_cmd_line(cmd_line->GetProgram()); |