chrome/browser/tab_contents/web_contents_unittest.cc - Issue 155071: Do some refactoring of renderer_host....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/tab_contents/web_contents_unittest.cc

Issue 155071: Do some refactoring of renderer_host.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 5 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

« chrome/browser/renderer_host/render_view_host_delegate.h ('K') | « chrome/browser/tab_contents/thumbnail_generator_unittest.cc ('k') | chrome/browser/tabs/tab_strip_model_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_view_host.h"	6 #include "chrome/browser/renderer_host/render_view_host.h"

7 #include "chrome/browser/renderer_host/render_widget_host_view.h"	7 #include "chrome/browser/renderer_host/render_widget_host_view.h"

8 #include "chrome/browser/renderer_host/test_render_view_host.h"	8 #include "chrome/browser/renderer_host/test/test_render_view_host.h"

9 #include "chrome/browser/tab_contents/interstitial_page.h"	9 #include "chrome/browser/tab_contents/interstitial_page.h"

10 #include "chrome/browser/tab_contents/navigation_controller.h"	10 #include "chrome/browser/tab_contents/navigation_controller.h"

11 #include "chrome/browser/tab_contents/navigation_entry.h"	11 #include "chrome/browser/tab_contents/navigation_entry.h"

12 #include "chrome/browser/tab_contents/test_web_contents.h"	12 #include "chrome/browser/tab_contents/test_web_contents.h"

13 #include "chrome/common/chrome_paths.h"	13 #include "chrome/common/chrome_paths.h"

14 #include "chrome/common/ipc_channel.h"	14 #include "chrome/common/ipc_channel.h"

15 #include "chrome/common/pref_service.h"	15 #include "chrome/common/pref_service.h"

16 #include "chrome/common/render_messages.h"	16 #include "chrome/common/render_messages.h"

17 #include "chrome/test/testing_profile.h"	17 #include "chrome/test/testing_profile.h"

18 #include "testing/gtest/include/gtest/gtest.h"	18 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 1230 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1249 NavigationEntry* entry = contents()->controller().pending_entry();	1249 NavigationEntry* entry = contents()->controller().pending_entry();

1250 ASSERT_TRUE(entry);	1250 ASSERT_TRUE(entry);

1251 EXPECT_EQ(kUrl, entry->url().spec());	1251 EXPECT_EQ(kUrl, entry->url().spec());

1252	1252

1253 // And that the first interstitial is gone, but not the second.	1253 // And that the first interstitial is gone, but not the second.

1254 EXPECT_TRUE(deleted);	1254 EXPECT_TRUE(deleted);

1255 EXPECT_EQ(TestInterstitialPage::CANCELED, state);	1255 EXPECT_EQ(TestInterstitialPage::CANCELED, state);

1256 EXPECT_FALSE(deleted2);	1256 EXPECT_FALSE(deleted2);

1257 EXPECT_EQ(TestInterstitialPage::UNDECIDED, state2);	1257 EXPECT_EQ(TestInterstitialPage::UNDECIDED, state2);

1258 }	1258 }

OLD	NEW