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/json/json_reader.h" | 5 #include "base/json/json_reader.h" |
6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "content/browser/renderer_host/render_view_host_impl.h" | 10 #include "content/browser/renderer_host/render_view_host_impl.h" |
11 #include "content/browser/site_instance_impl.h" | 11 #include "content/browser/site_instance_impl.h" |
12 #include "content/browser/web_contents/web_contents_impl.h" | 12 #include "content/browser/web_contents/web_contents_impl.h" |
13 #include "content/common/content_constants_internal.h" | 13 #include "content/common/content_constants_internal.h" |
14 #include "content/public/browser/navigation_controller.h" | 14 #include "content/public/browser/navigation_controller.h" |
15 #include "content/public/browser/navigation_entry.h" | 15 #include "content/public/browser/navigation_entry.h" |
16 #include "content/public/browser/notification_details.h" | 16 #include "content/public/browser/notification_details.h" |
17 #include "content/public/browser/notification_observer.h" | 17 #include "content/public/browser/notification_observer.h" |
18 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
19 #include "content/public/browser/notification_types.h" | 19 #include "content/public/browser/notification_types.h" |
20 #include "content/public/browser/render_process_host.h" | 20 #include "content/public/browser/render_process_host.h" |
21 #include "content/public/browser/render_view_host_observer.h" | 21 #include "content/public/browser/render_view_host_observer.h" |
22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
23 #include "content/public/browser/web_contents_observer.h" | 23 #include "content/public/browser/web_contents_observer.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_navigation_observer.h" | 26 #include "content/public/test/test_navigation_observer.h" |
27 #include "content/public/test/test_utils.h" | 27 #include "content/public/test/test_utils.h" |
28 #include "content/shell/shell.h" | 28 #include "content/shell/browser/shell.h" |
29 #include "content/test/content_browser_test.h" | 29 #include "content/test/content_browser_test.h" |
30 #include "content/test/content_browser_test_utils.h" | 30 #include "content/test/content_browser_test_utils.h" |
31 #include "net/base/net_util.h" | 31 #include "net/base/net_util.h" |
32 #include "net/test/spawned_test_server/spawned_test_server.h" | 32 #include "net/test/spawned_test_server/spawned_test_server.h" |
33 | 33 |
34 namespace content { | 34 namespace content { |
35 | 35 |
36 class RenderViewHostManagerTest : public ContentBrowserTest { | 36 class RenderViewHostManagerTest : public ContentBrowserTest { |
37 public: | 37 public: |
38 RenderViewHostManagerTest() {} | 38 RenderViewHostManagerTest() {} |
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1290 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); | 1290 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); |
1291 | 1291 |
1292 // Make sure it ends up at the right page. | 1292 // Make sure it ends up at the right page. |
1293 WaitForLoadStop(shell()->web_contents()); | 1293 WaitForLoadStop(shell()->web_contents()); |
1294 EXPECT_EQ(https_server.GetURL("files/title1.html"), | 1294 EXPECT_EQ(https_server.GetURL("files/title1.html"), |
1295 shell()->web_contents()->GetLastCommittedURL()); | 1295 shell()->web_contents()->GetLastCommittedURL()); |
1296 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); | 1296 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); |
1297 } | 1297 } |
1298 | 1298 |
1299 } // namespace content | 1299 } // namespace content |
OLD | NEW |