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

Unified Diff: content/test/content_browser_test.cc

Issue 8414020: Expose the sandbox related code through the content API. I did a bit of cleanup while I was doing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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: content/test/content_browser_test.cc
===================================================================
--- content/test/content_browser_test.cc (revision 107845)
+++ content/test/content_browser_test.cc (working copy)
@@ -5,12 +5,15 @@
#include "content/test/content_browser_test.h"
#include "base/debug/stack_trace.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/message_loop.h"
#include "content/shell/shell.h"
#include "content/shell/shell_main_delegate.h"
#include "content/test/test_content_client.h"
+#if defined(OS_MACOSX)
+#include "base/mac/scoped_nsautorelease_pool.h"
+#endif
+
ContentBrowserTest::ContentBrowserTest() {
}
@@ -46,6 +49,7 @@
signal(SIGTERM, DumpStackTraceSignalHandler);
#endif // defined(OS_POSIX)
+#if defined(OS_MACOSX)
// On Mac, without the following autorelease pool, code which is directly
// executed (as opposed to executed inside a message loop) would autorelease
// objects into a higher-level pool. This pool is not recycled in-sync with
@@ -54,14 +58,22 @@
// browser shutdown). To avoid this, the following pool is recycled after each
// time code is directly executed.
base::mac::ScopedNSAutoreleasePool pool;
+#endif
// Pump startup related events.
MessageLoopForUI::current()->RunAllPending();
+
+#if defined(OS_MACOSX)
pool.Recycle();
+#endif
RunTestOnMainThread();
+#if defined(OS_MACOSX)
pool.Recycle();
+#endif
MessageLoopForUI::current()->Quit();
+#if defined(OS_MACOSX)
pool.Recycle();
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698