chrome/browser/sync/sync_global_error_unittest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/sync/sync_global_error_unittest.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

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 "chrome/browser/sync/sync_global_error.h"	5 #include "chrome/browser/sync/sync_global_error.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

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

9 #include "chrome/app/chrome_command_ids.h"	9 #include "chrome/app/chrome_command_ids.h"

10 #include "chrome/browser/signin/signin_manager.h"	10 #include "chrome/browser/signin/signin_manager.h"

11 #include "chrome/browser/signin/signin_manager_factory.h"	11 #include "chrome/browser/signin/signin_manager_factory.h"

12 #include "chrome/browser/sync/profile_sync_service_mock.h"	12 #include "chrome/browser/sync/profile_sync_service_mock.h"

13 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	14 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

15 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	15 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

16 #include "chrome/test/base/browser_with_test_window_test.h"	16 #include "chrome/test/base/browser_with_test_window_test.h"

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

18 #include "content/public/test/test_browser_thread.h"	18 #include "content/public/test/test_browser_thread.h"

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 .WillRepeatedly(Return(false));	174 .WillRepeatedly(Return(false));

175	175

176 EXPECT_CALL(service, IsPassphraseRequired())	176 EXPECT_CALL(service, IsPassphraseRequired())

177 .WillRepeatedly(Return(true));	177 .WillRepeatedly(Return(true));

178 EXPECT_CALL(service, IsPassphraseRequiredForDecryption())	178 EXPECT_CALL(service, IsPassphraseRequiredForDecryption())

179 .WillRepeatedly(Return(true));	179 .WillRepeatedly(Return(true));

180 VerifySyncGlobalErrorResult(	180 VerifySyncGlobalErrorResult(

181 &service, login_ui_service, browser(), &error,	181 &service, login_ui_service, browser(), &error,

182 GoogleServiceAuthError::NONE, true, true);	182 GoogleServiceAuthError::NONE, true, true);

183 }	183 }

OLD	NEW