chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/signin/auth_sync_observer.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_throttle.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 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/run_loop.h"	5 #include "base/run_loop.h"

6 #include "base/time/time.h"	6 #include "base/time/time.h"

7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"	7 #include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"

8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"	8 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"	9 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"

10 #include "chrome/browser/chromeos/login/users/user_manager.h"	10 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"

11 #include "chrome/browser/chromeos/settings/cros_settings.h"	11 #include "chrome/browser/chromeos/settings/cros_settings.h"

12 #include "chrome/browser/chromeos/settings/device_settings_service.h"	12 #include "chrome/browser/chromeos/settings/device_settings_service.h"

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

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

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

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

17 #include "content/public/test/web_contents_tester.h"	17 #include "content/public/test/web_contents_tester.h"

18	18

19 using content::InterstitialPage;	19 using content::InterstitialPage;

20 using content::WebContents;	20 using content::WebContents;

(...skipping 153 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174	174

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

176 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());	176 EXPECT_EQ(kURL2, web_contents()->GetVisibleURL().spec());

177	177

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

179 Navigate(kURL2, 2);	179 Navigate(kURL2, 2);

180 EXPECT_FALSE(GetMergeSessionLoadPage());	180 EXPECT_FALSE(GetMergeSessionLoadPage());

181 }	181 }

182	182

183 } // namespace chromeos	183 } // namespace chromeos

OLD	NEW