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

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

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month 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
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/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_commands.h" 11 #include "chrome/browser/ui/browser_commands.h"
12 #include "chrome/browser/ui/browser_finder.h" 12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_iterator.h" 13 #include "chrome/browser/ui/browser_iterator.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.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 #include "net/test/embedded_test_server/embedded_test_server.h"
21 22
22 using content::BrowserThread; 23 using content::BrowserThread;
23 24
24 class FastShutdown : public InProcessBrowserTest { 25 class FastShutdown : public InProcessBrowserTest {
25 protected: 26 protected:
26 FastShutdown() { 27 FastShutdown() {
27 } 28 }
28 29
29 void SetUpCommandLine(base::CommandLine* command_line) override { 30 void SetUpCommandLine(base::CommandLine* command_line) override {
30 command_line->AppendSwitch(switches::kDisablePopupBlocking); 31 command_line->AppendSwitch(switches::kDisablePopupBlocking);
31 } 32 }
32 33
33 private: 34 private:
34 DISALLOW_COPY_AND_ASSIGN(FastShutdown); 35 DISALLOW_COPY_AND_ASSIGN(FastShutdown);
35 }; 36 };
36 37
37 // This tests for a previous error where uninstalling an onbeforeunload handler 38 // This tests for a previous error where uninstalling an onbeforeunload handler
38 // would enable fast shutdown even if an onunload handler still existed. 39 // would enable fast shutdown even if an onunload handler still existed.
39 // Flaky on all platforms, http://crbug.com/89173 40 // Flaky on all platforms, http://crbug.com/89173
40 #if !defined(OS_CHROMEOS) // ChromeOS opens tabs instead of windows for popups. 41 #if !defined(OS_CHROMEOS) // ChromeOS opens tabs instead of windows for popups.
41 IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) { 42 IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) {
42 // Need to run these tests on http:// since we only allow cookies on that (and 43 // Need to run these tests on http:// since we only allow cookies on that (and
43 // https obviously). 44 // https obviously).
44 ASSERT_TRUE(test_server()->Start()); 45 ASSERT_TRUE(embedded_test_server()->Start());
45 // This page has an unload handler. 46 // This page has an unload handler.
46 GURL url = test_server()->GetURL("files/fast_shutdown/on_unloader.html"); 47 GURL url = embedded_test_server()->GetURL("/fast_shutdown/on_unloader.html");
47 EXPECT_EQ("", content::GetCookies(browser()->profile(), url)); 48 EXPECT_EQ("", content::GetCookies(browser()->profile(), url));
48 49
49 content::WindowedNotificationObserver window_observer( 50 content::WindowedNotificationObserver window_observer(
50 chrome::NOTIFICATION_BROWSER_WINDOW_READY, 51 chrome::NOTIFICATION_BROWSER_WINDOW_READY,
51 content::NotificationService::AllSources()); 52 content::NotificationService::AllSources());
52 ui_test_utils::NavigateToURLWithDisposition( 53 ui_test_utils::NavigateToURLWithDisposition(
53 browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE); 54 browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
54 window_observer.Wait(); 55 window_observer.Wait();
55 56
56 // Close the new window, removing the one and only beforeunload handler. 57 // Close the new window, removing the one and only beforeunload handler.
57 ASSERT_EQ(2u, chrome::GetTotalBrowserCount()); 58 ASSERT_EQ(2u, chrome::GetTotalBrowserCount());
58 chrome::BrowserIterator it; 59 chrome::BrowserIterator it;
59 it.Next(); 60 it.Next();
60 chrome::CloseWindow(*it); 61 chrome::CloseWindow(*it);
61 62
62 // Need to wait for the renderer process to shutdown to ensure that we got the 63 // Need to wait for the renderer process to shutdown to ensure that we got the
63 // set cookies IPC. 64 // set cookies IPC.
64 content::RenderProcessHostWatcher renderer_shutdown_observer( 65 content::RenderProcessHostWatcher renderer_shutdown_observer(
65 browser()->tab_strip_model()->GetActiveWebContents(), 66 browser()->tab_strip_model()->GetActiveWebContents(),
66 content::RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION); 67 content::RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION);
67 // Close the tab. This should launch the unload handler, which sets a cookie 68 // Close the tab. This should launch the unload handler, which sets a cookie
68 // that's stored to disk. 69 // that's stored to disk.
69 chrome::CloseTab(browser()); 70 chrome::CloseTab(browser());
70 renderer_shutdown_observer.Wait(); 71 renderer_shutdown_observer.Wait();
71 72
72 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url)); 73 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url));
73 } 74 }
74 #endif 75 #endif
OLDNEW
« no previous file with comments | « chrome/browser/external_extension_browsertest.cc ('k') | chrome/browser/favicon/content_favicon_driver_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698