chrome/browser/sync/sync_ui_util_unittest.cc - Issue 2389063002: [Sync] Fixing easy lint violations.

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_ui_util_unittest.cc

Issue 2389063002: [Sync] Fixing easy lint violations. (Closed)

Patch Set: Updated for Max's comments. Created 4 years, 2 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

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 <stddef.h>	5 #include <stddef.h>

6	6

	7 #include <memory>

	8

7 #include <set>	9 #include <set>

8 #include "base/macros.h"	10 #include "base/macros.h"

9 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

10 #include "build/build_config.h"	12 #include "build/build_config.h"

11 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/signin/account_tracker_service_factory.h"	14 #include "chrome/browser/signin/account_tracker_service_factory.h"

13 #include "chrome/browser/signin/chrome_signin_client_factory.h"	15 #include "chrome/browser/signin/chrome_signin_client_factory.h"

14 #include "chrome/browser/signin/signin_error_controller_factory.h"	16 #include "chrome/browser/signin/signin_error_controller_factory.h"

15 #include "chrome/browser/signin/signin_manager_factory.h"	17 #include "chrome/browser/signin/signin_manager_factory.h"

16 #include "chrome/browser/sync/profile_sync_test_util.h"	18 #include "chrome/browser/sync/profile_sync_test_util.h"

(...skipping 413 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
430 // from previous one.	432 // from previous one.

431 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT;	433 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT;

432 EXPECT_CALL(service, QueryDetailedSyncStatus(_))	434 EXPECT_CALL(service, QueryDetailedSyncStatus(_))

433 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));	435 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));

434 base::string16 upgrade_client_status_label;	436 base::string16 upgrade_client_status_label;

435 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,	437 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,

436 sync_ui_util::PLAIN_TEXT,	438 sync_ui_util::PLAIN_TEXT,

437 &upgrade_client_status_label, &link_label);	439 &upgrade_client_status_label, &link_label);

438 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label);	440 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label);

439 }	441 }

OLD	NEW