content/browser/web_contents/web_contents_impl_unittest.cc - Issue 49823002: Move navigation and frame tree classes to a new frame_host/ directory.

Side by Side Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 49823002: Move navigation and frame tree classes to a new frame_host/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include. Created 7 years, 1 month 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

« content/browser/frame_host/web_contents_screenshot_manager.h ('K') | « content/browser/web_contents/web_contents_impl.cc ('k') | content/browser/web_contents/web_contents_screenshot_manager.h » ('j') | content/content_browser.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/logging.h"	5 #include "base/logging.h"

6 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

	7 #include "content/browser/frame_host/interstitial_page_impl.h"

	8 #include "content/browser/frame_host/navigation_entry_impl.h"

7 #include "content/browser/renderer_host/render_view_host_impl.h"	9 #include "content/browser/renderer_host/render_view_host_impl.h"

8 #include "content/browser/renderer_host/test_render_view_host.h"	10 #include "content/browser/renderer_host/test_render_view_host.h"

9 #include "content/browser/site_instance_impl.h"	11 #include "content/browser/site_instance_impl.h"

10 #include "content/browser/web_contents/interstitial_page_impl.h"

11 #include "content/browser/web_contents/navigation_entry_impl.h"

12 #include "content/browser/webui/web_ui_controller_factory_registry.h"	12 #include "content/browser/webui/web_ui_controller_factory_registry.h"

13 #include "content/common/view_messages.h"	13 #include "content/common/view_messages.h"

14 #include "content/public/browser/global_request_id.h"	14 #include "content/public/browser/global_request_id.h"

15 #include "content/public/browser/interstitial_page_delegate.h"	15 #include "content/public/browser/interstitial_page_delegate.h"

16 #include "content/public/browser/navigation_details.h"	16 #include "content/public/browser/navigation_details.h"

17 #include "content/public/browser/notification_details.h"	17 #include "content/public/browser/notification_details.h"

18 #include "content/public/browser/notification_source.h"	18 #include "content/public/browser/notification_source.h"

19 #include "content/public/browser/render_widget_host_view.h"	19 #include "content/public/browser/render_widget_host_view.h"

20 #include "content/public/browser/web_contents_observer.h"	20 #include "content/public/browser/web_contents_observer.h"

21 #include "content/public/browser/web_ui_controller.h"	21 #include "content/public/browser/web_ui_controller.h"

(...skipping 2116 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2138 TEST_F(WebContentsImplTest, PendingContents) {	2138 TEST_F(WebContentsImplTest, PendingContents) {

2139 scoped_ptr<TestWebContents> other_contents(	2139 scoped_ptr<TestWebContents> other_contents(

2140 static_cast<TestWebContents*>(CreateTestWebContents()));	2140 static_cast<TestWebContents*>(CreateTestWebContents()));

2141 contents()->AddPendingContents(other_contents.get());	2141 contents()->AddPendingContents(other_contents.get());

2142 int route_id = other_contents->GetRenderViewHost()->GetRoutingID();	2142 int route_id = other_contents->GetRenderViewHost()->GetRoutingID();

2143 other_contents.reset();	2143 other_contents.reset();

2144 EXPECT_EQ(NULL, contents()->GetCreatedWindow(route_id));	2144 EXPECT_EQ(NULL, contents()->GetCreatedWindow(route_id));

2145 }	2145 }

2146	2146

2147 } // namespace content	2147 } // namespace content

OLD	NEW