| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/content_settings/cookie_settings.h" | 8 #include "chrome/browser/content_settings/cookie_settings.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_dialogs.h" | 10 #include "chrome/browser/ui/browser_dialogs.h" |
| 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 11 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 12 #include "chrome/common/net/url_fixer_upper.h" | |
| 13 #include "chrome/common/url_constants.h" | 12 #include "chrome/common/url_constants.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "net/test/embedded_test_server/embedded_test_server.h" | 15 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 17 | 16 |
| 18 typedef InProcessBrowserTest CollectedCookiesTest; | 17 typedef InProcessBrowserTest CollectedCookiesTest; |
| 19 | 18 |
| 20 // If this crashes on Windows, use http://crbug.com/79331 | 19 // If this crashes on Windows, use http://crbug.com/79331 |
| 21 IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { | 20 IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { |
| 22 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 21 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 50 | 49 |
| 51 // Click on the info link. | 50 // Click on the info link. |
| 52 content::WebContents* web_contents = | 51 content::WebContents* web_contents = |
| 53 browser()->tab_strip_model()->GetActiveWebContents(); | 52 browser()->tab_strip_model()->GetActiveWebContents(); |
| 54 chrome::ShowCollectedCookiesDialog(web_contents); | 53 chrome::ShowCollectedCookiesDialog(web_contents); |
| 55 | 54 |
| 56 // Navigate to another page. | 55 // Navigate to another page. |
| 57 ui_test_utils::NavigateToURL( | 56 ui_test_utils::NavigateToURL( |
| 58 browser(), embedded_test_server()->GetURL("/cookie2.html")); | 57 browser(), embedded_test_server()->GetURL("/cookie2.html")); |
| 59 } | 58 } |
| OLD | NEW |