| 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/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_list.h" | 11 #include "chrome/browser/ui/browser_list.h" |
| 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/common/chrome_notification_types.h" | 14 #include "chrome/common/chrome_notification_types.h" |
| 15 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
| 16 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
| 17 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
| 18 #include "content/public/browser/notification_service.h" | 18 #include "content/public/browser/notification_service.h" |
| 19 #include "content/public/test/browser_test_utils.h" | 19 #include "content/public/test/browser_test_utils.h" |
| 20 | 20 |
| 21 using content::BrowserThread; | 21 using content::BrowserThread; |
| 22 | 22 |
| 23 class FastShutdown : public InProcessBrowserTest { | 23 class FastShutdown : public InProcessBrowserTest { |
| 24 protected: | 24 protected: |
| 25 FastShutdown() { | 25 FastShutdown() { |
| 26 } | 26 } |
| 27 | 27 |
| 28 virtual void SetUpCommandLine(CommandLine* command_line) { | 28 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 29 command_line->AppendSwitch(switches::kDisablePopupBlocking); | 29 command_line->AppendSwitch(switches::kDisablePopupBlocking); |
| 30 } | 30 } |
| 31 | 31 |
| 32 private: | 32 private: |
| 33 DISALLOW_COPY_AND_ASSIGN(FastShutdown); | 33 DISALLOW_COPY_AND_ASSIGN(FastShutdown); |
| 34 }; | 34 }; |
| 35 | 35 |
| 36 // This tests for a previous error where uninstalling an onbeforeunload handler | 36 // This tests for a previous error where uninstalling an onbeforeunload handler |
| 37 // would enable fast shutdown even if an onunload handler still existed. | 37 // would enable fast shutdown even if an onunload handler still existed. |
| 38 // Flaky on all platforms, http://crbug.com/89173 | 38 // Flaky on all platforms, http://crbug.com/89173 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 64 content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, | 64 content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, |
| 65 content::NotificationService::AllSources()); | 65 content::NotificationService::AllSources()); |
| 66 // Close the tab. This should launch the unload handler, which sets a cookie | 66 // Close the tab. This should launch the unload handler, which sets a cookie |
| 67 // that's stored to disk. | 67 // that's stored to disk. |
| 68 chrome::CloseTab(browser()); | 68 chrome::CloseTab(browser()); |
| 69 renderer_shutdown_observer.Wait(); | 69 renderer_shutdown_observer.Wait(); |
| 70 | 70 |
| 71 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url)); | 71 EXPECT_EQ("unloaded=ohyeah", content::GetCookies(browser()->profile(), url)); |
| 72 } | 72 } |
| 73 #endif | 73 #endif |
| OLD | NEW |