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

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 10409022: Move application lifetime functionality off BrowserList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/in_process_browser_test.cc
===================================================================
--- chrome/test/base/in_process_browser_test.cc (revision 137868)
+++ chrome/test/base/in_process_browser_test.cc (working copy)
@@ -15,6 +15,7 @@
#include "base/test/test_file_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/io_thread.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
@@ -345,7 +346,7 @@
autorelease_pool_->Recycle();
#endif
- if (BrowserList::size()) {
+ if (!BrowserList::empty()) {
browser_ = *BrowserList::begin();
ui_test_utils::WaitForLoadStop(browser_->GetSelectedWebContents());
}
@@ -376,14 +377,14 @@
}
void InProcessBrowserTest::QuitBrowsers() {
- if (BrowserList::size() == 0)
+ if (BrowserList::empty())
return;
// Invoke CloseAllBrowsersAndMayExit on a running message loop.
// CloseAllBrowsersAndMayExit exits the message loop after everything has been
// shut down properly.
MessageLoopForUI::current()->PostTask(FROM_HERE,
- base::Bind(&BrowserList::AttemptExit));
+ base::Bind(&browser::AttemptExit));
ui_test_utils::RunMessageLoop();
#if defined(OS_MACOSX)
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698