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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 7 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/test/base/in_process_browser_test.h" | 9 #include "chrome/test/base/in_process_browser_test.h" |
10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 EXPECT_TRUE(entry->GetVirtualURL().is_valid()); | 81 EXPECT_TRUE(entry->GetVirtualURL().is_valid()); |
82 EXPECT_EQ(url, entry->GetVirtualURL()); | 82 EXPECT_EQ(url, entry->GetVirtualURL()); |
83 } | 83 } |
84 | 84 |
85 // Test that a basic navigation works in --site-per-process mode. This prevents | 85 // Test that a basic navigation works in --site-per-process mode. This prevents |
86 // regressions when that mode calls out into the ChromeContentBrowserClient, | 86 // regressions when that mode calls out into the ChromeContentBrowserClient, |
87 // such as http://crbug.com/164223. | 87 // such as http://crbug.com/164223. |
88 IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest, | 88 IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest, |
89 SitePerProcessNavigation) { | 89 SitePerProcessNavigation) { |
90 content::IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess()); | 90 content::IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess()); |
91 ASSERT_TRUE(test_server()->Start()); | 91 ASSERT_TRUE(embedded_test_server()->Start()); |
92 const GURL url(test_server()->GetURL("files/title1.html")); | 92 const GURL url(embedded_test_server()->GetURL("/title1.html")); |
93 | 93 |
94 ui_test_utils::NavigateToURL(browser(), url); | 94 ui_test_utils::NavigateToURL(browser(), url); |
95 NavigationEntry* entry = GetLastCommittedEntry(); | 95 NavigationEntry* entry = GetLastCommittedEntry(); |
96 | 96 |
97 ASSERT_TRUE(entry != NULL); | 97 ASSERT_TRUE(entry != NULL); |
98 EXPECT_EQ(url, entry->GetURL()); | 98 EXPECT_EQ(url, entry->GetURL()); |
99 EXPECT_EQ(url, entry->GetVirtualURL()); | 99 EXPECT_EQ(url, entry->GetVirtualURL()); |
100 } | 100 } |
101 | 101 |
102 } // namespace content | 102 } // namespace content |
OLD | NEW |