Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: chrome/browser/chrome_content_browser_client_browsertest.cc

Issue 1208143002: Move existing kSitePerProcess checks to a policy-oracle object (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@swapped_out_cmdline_checks
Patch Set: Attempt to fix compile. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_site_per_process_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
11 #include "content/public/browser/navigation_controller.h" 11 #include "content/public/browser/navigation_controller.h"
12 #include "content/public/browser/navigation_entry.h" 12 #include "content/public/browser/navigation_entry.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/test/browser_test_utils.h"
15 #include "url/gurl.h" 15 #include "url/gurl.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 class ChromeContentBrowserClientBrowserTest : public InProcessBrowserTest { 19 class ChromeContentBrowserClientBrowserTest : public InProcessBrowserTest {
20 public: 20 public:
21 // Returns the last committed navigation entry of the first tab. May be NULL 21 // Returns the last committed navigation entry of the first tab. May be NULL
22 // if there is no such entry. 22 // if there is no such entry.
23 NavigationEntry* GetLastCommittedEntry() { 23 NavigationEntry* GetLastCommittedEntry() {
24 return browser()->tab_strip_model()->GetWebContentsAt(0)-> 24 return browser()->tab_strip_model()->GetWebContentsAt(0)->
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 ASSERT_TRUE(entry != NULL); 80 ASSERT_TRUE(entry != NULL);
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 base::CommandLine::ForCurrentProcess()->AppendSwitch( 90 content::IsolateAllSitesForTesting(base::CommandLine::ForCurrentProcess());
91 switches::kSitePerProcess);
92 ASSERT_TRUE(test_server()->Start()); 91 ASSERT_TRUE(test_server()->Start());
93 const GURL url(test_server()->GetURL("files/title1.html")); 92 const GURL url(test_server()->GetURL("files/title1.html"));
94 93
95 ui_test_utils::NavigateToURL(browser(), url); 94 ui_test_utils::NavigateToURL(browser(), url);
96 NavigationEntry* entry = GetLastCommittedEntry(); 95 NavigationEntry* entry = GetLastCommittedEntry();
97 96
98 ASSERT_TRUE(entry != NULL); 97 ASSERT_TRUE(entry != NULL);
99 EXPECT_EQ(url, entry->GetURL()); 98 EXPECT_EQ(url, entry->GetURL());
100 EXPECT_EQ(url, entry->GetVirtualURL()); 99 EXPECT_EQ(url, entry->GetVirtualURL());
101 } 100 }
102 101
103 } // namespace content 102 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698