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/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 "content/common/content_constants_internal.h" | 11 #include "content/common/content_constants_internal.h" |
11 #include "content/browser/renderer_host/render_view_host_impl.h" | 12 #include "content/browser/renderer_host/render_view_host_impl.h" |
12 #include "content/browser/site_instance_impl.h" | 13 #include "content/browser/site_instance_impl.h" |
13 #include "content/browser/web_contents/web_contents_impl.h" | 14 #include "content/browser/web_contents/web_contents_impl.h" |
14 #include "content/public/browser/navigation_controller.h" | 15 #include "content/public/browser/navigation_controller.h" |
15 #include "content/public/browser/navigation_entry.h" | 16 #include "content/public/browser/navigation_entry.h" |
16 #include "content/public/browser/notification_details.h" | 17 #include "content/public/browser/notification_details.h" |
17 #include "content/public/browser/notification_observer.h" | 18 #include "content/public/browser/notification_observer.h" |
18 #include "content/public/browser/notification_registrar.h" | 19 #include "content/public/browser/notification_registrar.h" |
19 #include "content/public/browser/notification_types.h" | 20 #include "content/public/browser/notification_types.h" |
(...skipping 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1444 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); | 1445 NavigateToURL(shell(), https_server.GetURL("files/title1.html")); |
1445 | 1446 |
1446 // Make sure it ends up at the right page. | 1447 // Make sure it ends up at the right page. |
1447 WaitForLoadStop(shell()->web_contents()); | 1448 WaitForLoadStop(shell()->web_contents()); |
1448 EXPECT_EQ(https_server.GetURL("files/title1.html"), | 1449 EXPECT_EQ(https_server.GetURL("files/title1.html"), |
1449 shell()->web_contents()->GetURL()); | 1450 shell()->web_contents()->GetURL()); |
1450 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); | 1451 EXPECT_EQ(new_site_instance, shell()->web_contents()->GetSiteInstance()); |
1451 } | 1452 } |
1452 | 1453 |
1453 } // namespace content | 1454 } // namespace content |
OLD | NEW |