chrome/browser/chromeos/login/merge_session_load_page_unittest.cc - Issue 12319034: Merge 182894

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/chromeos/login/merge_session_load_page_unittest.cc

Issue 12319034: Merge 182894 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « chrome/browser/chromeos/login/merge_session_load_page.cc ('k') | chrome/browser/chromeos/login/merge_session_throttle.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "chrome/browser/chromeos/cros/cros_library.h"	5 #include "chrome/browser/chromeos/cros/cros_library.h"

6 #include "chrome/browser/chromeos/login/merge_session_load_page.h"	6 #include "chrome/browser/chromeos/login/merge_session_load_page.h"

7 #include "chrome/test/base/chrome_render_view_host_test_harness.h"	7 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

8 #include "content/public/browser/interstitial_page.h"	8 #include "content/public/browser/interstitial_page.h"

9 #include "content/public/browser/navigation_controller.h"	9 #include "content/public/browser/navigation_controller.h"

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

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118	118

119 // The URL remains to be URL2.	119 // The URL remains to be URL2.

120 EXPECT_EQ(kURL2, web_contents()->GetURL().spec());	120 EXPECT_EQ(kURL2, web_contents()->GetURL().spec());

121	121

122 // Commit navigation and the interstitial page is gone.	122 // Commit navigation and the interstitial page is gone.

123 Navigate(kURL2, 2);	123 Navigate(kURL2, 2);

124 EXPECT_FALSE(GetMergeSessionLoadPage());	124 EXPECT_FALSE(GetMergeSessionLoadPage());

125 }	125 }

126	126

127 } // namespace chromeos	127 } // namespace chromeos

OLD	NEW