| 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "base/time.h" | 7 #include "base/time/time.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "content/browser/renderer_host/render_view_host_impl.h" | 9 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
| 11 #include "content/common/view_messages.h" | 11 #include "content/common/view_messages.h" |
| 12 #include "content/public/browser/notification_types.h" | 12 #include "content/public/browser/notification_types.h" |
| 13 #include "content/public/browser/web_contents_observer.h" | 13 #include "content/public/browser/web_contents_observer.h" |
| 14 #include "content/public/common/content_paths.h" | 14 #include "content/public/common/content_paths.h" |
| 15 #include "content/public/test/browser_test_utils.h" | 15 #include "content/public/test/browser_test_utils.h" |
| 16 #include "content/shell/shell.h" | 16 #include "content/shell/shell.h" |
| 17 #include "content/test/content_browser_test.h" | 17 #include "content/test/content_browser_test.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 Shell* new_shell = new_shell_observer.GetShell(); | 109 Shell* new_shell = new_shell_observer.GetShell(); |
| 110 RenderViewHostImpl* new_rvh = static_cast<RenderViewHostImpl*>( | 110 RenderViewHostImpl* new_rvh = static_cast<RenderViewHostImpl*>( |
| 111 new_shell->web_contents()->GetRenderViewHost()); | 111 new_shell->web_contents()->GetRenderViewHost()); |
| 112 | 112 |
| 113 EXPECT_TRUE(new_rvh->main_render_frame_host_.get()); | 113 EXPECT_TRUE(new_rvh->main_render_frame_host_.get()); |
| 114 EXPECT_NE(rvh->main_render_frame_host_->routing_id(), | 114 EXPECT_NE(rvh->main_render_frame_host_->routing_id(), |
| 115 new_rvh->main_render_frame_host_->routing_id()); | 115 new_rvh->main_render_frame_host_->routing_id()); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace content | 118 } // namespace content |
| OLD | NEW |