| OLD | NEW |
| 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 | 21 |
| 22 using content::BrowserThread; | 22 using content::BrowserThread; |
| 23 | 23 |
| 24 class FastShutdown : public InProcessBrowserTest { | 24 class FastShutdown : public InProcessBrowserTest { |
| 25 protected: | 25 protected: |
| 26 FastShutdown() { | 26 FastShutdown() { |
| 27 } | 27 } |
| 28 | 28 |
| 29 void SetUpCommandLine(CommandLine* command_line) override { | 29 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 30 command_line->AppendSwitch(switches::kDisablePopupBlocking); | 30 command_line->AppendSwitch(switches::kDisablePopupBlocking); |
| 31 } | 31 } |
| 32 | 32 |
| 33 private: | 33 private: |
| 34 DISALLOW_COPY_AND_ASSIGN(FastShutdown); | 34 DISALLOW_COPY_AND_ASSIGN(FastShutdown); |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 // This tests for a previous error where uninstalling an onbeforeunload handler | 37 // This tests for a previous error where uninstalling an onbeforeunload handler |
| 38 // would enable fast shutdown even if an onunload handler still existed. | 38 // would enable fast shutdown even if an onunload handler still existed. |
| 39 // Flaky on all platforms, http://crbug.com/89173 | 39 // Flaky on all platforms, http://crbug.com/89173 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 65 browser()->tab_strip_model()->GetActiveWebContents(), | 65 browser()->tab_strip_model()->GetActiveWebContents(), |
| 66 content::RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION); | 66 content::RenderProcessHostWatcher::WATCH_FOR_HOST_DESTRUCTION); |
| 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 |
| OLD | NEW |