| 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "base/stl_util-inl.h" | 6 #include "base/stl_util-inl.h" |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "base/test/thread_test_helper.h" | 8 #include "base/test/thread_test_helper.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" | 10 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" |
| 11 #include "chrome/browser/ui/view_ids.h" | 11 #include "chrome/browser/ui/view_ids.h" |
| 12 #include "chrome/common/chrome_constants.h" | 12 #include "chrome/common/chrome_constants.h" |
| 13 #include "chrome/test/automation/automation_proxy.h" | 13 #include "chrome/test/automation/automation_proxy.h" |
| 14 #include "chrome/test/automation/browser_proxy.h" | 14 #include "chrome/test/automation/browser_proxy.h" |
| 15 #include "chrome/test/automation/tab_proxy.h" | 15 #include "chrome/test/automation/tab_proxy.h" |
| 16 #include "chrome/test/automation/window_proxy.h" | 16 #include "chrome/test/automation/window_proxy.h" |
| 17 #include "chrome/test/ui/ui_test.h" | 17 #include "chrome/test/ui/ui_test.h" |
| 18 #include "chrome/test/ui_test_utils.h" | 18 #include "chrome/test/ui_test_utils.h" |
| 19 #include "content/browser/browser_thread.h" | 19 #include "content/browser/browser_thread.h" |
| 20 #include "ui/base/events.h" | 20 #include "ui/base/events.h" |
| 21 #include "ui/base/message_box_flags.h" | 21 #include "ui/base/message_box_flags.h" |
| 22 #include "ui/gfx/rect.h" | 22 #include "ui/gfx/rect.h" |
| 23 | 23 |
| 24 class FastShutdown : public UITest { | 24 class FastShutdown : public UITest { |
| 25 }; | 25 }; |
| 26 | 26 |
| 27 #if defined(OS_MACOSX) | 27 #if defined(OS_MACOSX) |
| 28 // SimulateOSClick is broken on the Mac: http://crbug.com/45162 | 28 // SimulateOSClick is broken on the Mac: http://crbug.com/45162 |
| 29 #define MAYBE_SlowTermination DISABLED_SlowTermination | 29 #define MAYBE_SlowTermination DISABLED_SlowTermination |
| 30 #elif defined(OS_CHROMEOS) |
| 31 // Flaky on chromeos: http://crbug.com/89173 |
| 32 #define MAYBE_SlowTermination FLAKY_SlowTermination |
| 30 #else | 33 #else |
| 31 #define MAYBE_SlowTermination SlowTermination | 34 #define MAYBE_SlowTermination SlowTermination |
| 32 #endif | 35 #endif |
| 33 | 36 |
| 34 // Loads the cookie store from |user_data_dir|. If the given |cookie| exists, | 37 // Loads the cookie store from |user_data_dir|. If the given |cookie| exists, |
| 35 // puts the cookie's value in |cookie_value| and sets |has_cookie| to true. | 38 // puts the cookie's value in |cookie_value| and sets |has_cookie| to true. |
| 36 // Sets |has_cookie| to false if the |cookie| wasn't found. | 39 // Sets |has_cookie| to false if the |cookie| wasn't found. |
| 37 static void GetCookie( | 40 static void GetCookie( |
| 38 const FilePath& user_data_dir, | 41 const FilePath& user_data_dir, |
| 39 const net::CookieMonster::CanonicalCookie& cookie, | 42 const net::CookieMonster::CanonicalCookie& cookie, |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 int exit_code = -1; | 123 int exit_code = -1; |
| 121 ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit( | 124 ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit( |
| 122 TestTimeouts::action_max_timeout_ms(), &exit_code)); | 125 TestTimeouts::action_max_timeout_ms(), &exit_code)); |
| 123 EXPECT_EQ(0, exit_code); // Expect a clean shutdown. | 126 EXPECT_EQ(0, exit_code); // Expect a clean shutdown. |
| 124 | 127 |
| 125 // Read the cookie and check that it has the expected value. | 128 // Read the cookie and check that it has the expected value. |
| 126 GetCookie(user_data_dir(), cookie, &has_cookie, &cookie_value, thread_helper); | 129 GetCookie(user_data_dir(), cookie, &has_cookie, &cookie_value, thread_helper); |
| 127 EXPECT_TRUE(has_cookie); | 130 EXPECT_TRUE(has_cookie); |
| 128 EXPECT_EQ("ohyeah", cookie_value); | 131 EXPECT_EQ("ohyeah", cookie_value); |
| 129 } | 132 } |
| OLD | NEW |