| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "chrome/app/chrome_dll_resource.h" | 7 #include "chrome/app/chrome_dll_resource.h" |
| 8 #include "chrome/browser/net/url_fixer_upper.h" | 8 #include "chrome/browser/net/url_fixer_upper.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| 11 #include "chrome/test/automation/tab_proxy.h" | 11 #include "chrome/test/automation/tab_proxy.h" |
| 12 #include "chrome/test/automation/browser_proxy.h" | 12 #include "chrome/test/automation/browser_proxy.h" |
| 13 #include "chrome/test/ui/ui_test.h" | 13 #include "chrome/test/ui/ui_test.h" |
| 14 #include "net/test/test_server.h" | 14 #include "net/test/test_server.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); | 18 const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); |
| 19 | 19 |
| 20 } // namespace | 20 } // namespace |
| 21 | 21 |
| 22 typedef UITest CollectedCookiesTest; | 22 typedef UITest CollectedCookiesTest; |
| 23 | 23 |
| 24 TEST_F(CollectedCookiesTest, DoubleDisplay) { | 24 // Flaky, http://crbug.com/62311. |
| 25 TEST_F(CollectedCookiesTest, FLAKY_DoubleDisplay) { |
| 25 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); | 26 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
| 26 ASSERT_TRUE(test_server.Start()); | 27 ASSERT_TRUE(test_server.Start()); |
| 27 | 28 |
| 28 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 29 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 29 ASSERT_TRUE(browser.get()); | 30 ASSERT_TRUE(browser.get()); |
| 30 | 31 |
| 31 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 32 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
| 32 ASSERT_TRUE(tab.get()); | 33 ASSERT_TRUE(tab.get()); |
| 33 | 34 |
| 34 // Disable cookies. | 35 // Disable cookies. |
| 35 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, | 36 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, |
| 36 CONTENT_SETTING_BLOCK)); | 37 CONTENT_SETTING_BLOCK)); |
| 37 | 38 |
| 38 // Load a page with cookies. | 39 // Load a page with cookies. |
| 39 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); | 40 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); |
| 40 | 41 |
| 41 // Click on the info link twice. | 42 // Click on the info link twice. |
| 42 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); | 43 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); |
| 43 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); | 44 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); |
| 44 } | 45 } |
| 45 | 46 |
| 46 TEST_F(CollectedCookiesTest, NavigateAway) { | 47 // Flaky, http://crbug.com/62311. |
| 48 TEST_F(CollectedCookiesTest, FLAKY_NavigateAway) { |
| 47 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); | 49 net::TestServer test_server(net::TestServer::TYPE_HTTP, FilePath(kDocRoot)); |
| 48 ASSERT_TRUE(test_server.Start()); | 50 ASSERT_TRUE(test_server.Start()); |
| 49 | 51 |
| 50 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 52 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 51 ASSERT_TRUE(browser.get()); | 53 ASSERT_TRUE(browser.get()); |
| 52 | 54 |
| 53 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 55 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
| 54 ASSERT_TRUE(tab.get()); | 56 ASSERT_TRUE(tab.get()); |
| 55 | 57 |
| 56 // Disable cookies. | 58 // Disable cookies. |
| 57 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, | 59 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, |
| 58 CONTENT_SETTING_BLOCK)); | 60 CONTENT_SETTING_BLOCK)); |
| 59 | 61 |
| 60 // Load a page with cookies. | 62 // Load a page with cookies. |
| 61 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); | 63 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie1.html"))); |
| 62 | 64 |
| 63 // Click on the info link. | 65 // Click on the info link. |
| 64 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); | 66 ASSERT_TRUE(tab->ShowCollectedCookiesDialog()); |
| 65 | 67 |
| 66 // Navigate to another page. | 68 // Navigate to another page. |
| 67 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie2.html"))); | 69 ASSERT_TRUE(tab->NavigateToURL(test_server.GetURL("files/cookie2.html"))); |
| 68 } | 70 } |
| OLD | NEW |