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

Side by Side Diff: content/browser/renderer_host/render_view_host_manager_browsertest.cc

Issue 14691006: Move SpawnedTestServer to its own subdirectory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyp Created 7 years, 7 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 | Annotate | Revision Log
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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/json/json_reader.h" 6 #include "base/json/json_reader.h"
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 10 matching lines...) Expand all
21 #include "content/public/browser/render_process_host.h" 21 #include "content/public/browser/render_process_host.h"
22 #include "content/public/browser/render_view_host_observer.h" 22 #include "content/public/browser/render_view_host_observer.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/common/url_constants.h" 24 #include "content/public/common/url_constants.h"
25 #include "content/public/test/browser_test_utils.h" 25 #include "content/public/test/browser_test_utils.h"
26 #include "content/public/test/test_utils.h" 26 #include "content/public/test/test_utils.h"
27 #include "content/shell/shell.h" 27 #include "content/shell/shell.h"
28 #include "content/test/content_browser_test.h" 28 #include "content/test/content_browser_test.h"
29 #include "content/test/content_browser_test_utils.h" 29 #include "content/test/content_browser_test_utils.h"
30 #include "net/base/net_util.h" 30 #include "net/base/net_util.h"
31 #include "net/test/spawned_test_server.h" 31 #include "net/test/spawned_test_server/spawned_test_server.h"
32 32
33 namespace content { 33 namespace content {
34 34
35 class RenderViewHostManagerTest : public ContentBrowserTest { 35 class RenderViewHostManagerTest : public ContentBrowserTest {
36 public: 36 public:
37 RenderViewHostManagerTest() {} 37 RenderViewHostManagerTest() {}
38 38
39 static bool GetFilePathWithHostAndPortReplacement( 39 static bool GetFilePathWithHostAndPortReplacement(
40 const std::string& original_file_path, 40 const std::string& original_file_path,
41 const net::HostPortPair& host_port_pair, 41 const net::HostPortPair& host_port_pair,
(...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); 1200 NavigateToURL(shell(), https_server.GetURL("files/title1.html"));
1201 1201
1202 // Make sure it ends up at the right page. 1202 // Make sure it ends up at the right page.
1203 WaitForLoadStop(shell()->web_contents()); 1203 WaitForLoadStop(shell()->web_contents());
1204 EXPECT_EQ(https_server.GetURL("files/title1.html"), 1204 EXPECT_EQ(https_server.GetURL("files/title1.html"),
1205 shell()->web_contents()->GetURL()); 1205 shell()->web_contents()->GetURL());
1206 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); 1206 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance());
1207 } 1207 }
1208 1208
1209 } // namespace content 1209 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_browsertest.cc ('k') | content/browser/session_history_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698