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

Side by Side Diff: chrome/browser/fast_shutdown_browsertest.cc

Issue 12212120: Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r182110 Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/browser_finder.h"
11 #include "chrome/browser/ui/browser_iterator.h" 12 #include "chrome/browser/ui/browser_iterator.h"
12 #include "chrome/browser/ui/browser_list.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/common/chrome_notification_types.h" 14 #include "chrome/common/chrome_notification_types.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
21 21
22 using content::BrowserThread; 22 using content::BrowserThread;
(...skipping 24 matching lines...) Expand all
47 EXPECT_EQ("", content::GetCookies(browser()->profile(), url)); 47 EXPECT_EQ("", content::GetCookies(browser()->profile(), url));
48 48
49 content::WindowedNotificationObserver window_observer( 49 content::WindowedNotificationObserver window_observer(
50 chrome::NOTIFICATION_BROWSER_WINDOW_READY, 50 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
51 content::NotificationService::AllSources()); 51 content::NotificationService::AllSources());
52 ui_test_utils::NavigateToURLWithDisposition( 52 ui_test_utils::NavigateToURLWithDisposition(
53 browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE); 53 browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
54 window_observer.Wait(); 54 window_observer.Wait();
55 55
56 // Close the new window, removing the one and only beforeunload handler. 56 // Close the new window, removing the one and only beforeunload handler.
57 ASSERT_EQ(2u, BrowserList::size()); 57 ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
58 chrome::BrowserIterator it; 58 chrome::BrowserIterator it;
59 it.Next(); 59 it.Next();
60 chrome::CloseWindow(*it); 60 chrome::CloseWindow(*it);
61 61
62 // Need to wait for the renderer process to shutdown to ensure that we got the 62 // Need to wait for the renderer process to shutdown to ensure that we got the
63 // set cookies IPC. 63 // set cookies IPC.
64 content::WindowedNotificationObserver renderer_shutdown_observer( 64 content::WindowedNotificationObserver renderer_shutdown_observer(
65 content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, 65 content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
66 content::NotificationService::AllSources()); 66 content::NotificationService::AllSources());
67 // Close the tab. This should launch the unload handler, which sets a cookie 67 // Close the tab. This should launch the unload handler, which sets a cookie
68 // that's stored to disk. 68 // that's stored to disk.
69 chrome::CloseTab(browser()); 69 chrome::CloseTab(browser());
70 renderer_shutdown_observer.Wait(); 70 renderer_shutdown_observer.Wait();
71 71
72 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url)); 72 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url));
73 } 73 }
74 #endif 74 #endif
OLDNEW
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/lifetime/application_lifetime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698