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

Unified Diff: chrome/browser/ui/settings_window_manager_browsertest.cc

Issue 1229473002: mac: Fix five browser_tests on Yosemite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ifdefs. Created 5 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/settings_window_manager_browsertest.cc
diff --git a/chrome/browser/ui/settings_window_manager_browsertest.cc b/chrome/browser/ui/settings_window_manager_browsertest.cc
index a551457c76738a1fb4f2d61132807cfb34aa972e..fa91d8b56c35222bcfce86e6d250255a29f7d3e1 100644
--- a/chrome/browser/ui/settings_window_manager_browsertest.cc
+++ b/chrome/browser/ui/settings_window_manager_browsertest.cc
@@ -23,6 +23,10 @@
#include "content/public/test/test_utils.h"
#include "url/gurl.h"
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+#include "base/mac/scoped_nsautorelease_pool.h"
+#endif // defined(OS_MACOSX) && !defined(OS_IOS)
+
namespace {
class SettingsWindowTestObserver
@@ -100,6 +104,9 @@ class SettingsWindowManagerTest : public InProcessBrowserTest {
chrome::NOTIFICATION_BROWSER_CLOSED,
content::NotificationService::AllSources());
browser->window()->Close();
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+ AutoreleasePool()->Recycle();
+#endif // defined(OS_MACOSX) && !defined(OS_IOS)
observer.Wait();
}
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698