Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: chrome/browser/sync/sync_ui_util_unittest.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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
OLDNEW
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 <set> 7 #include <set>
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 16 matching lines...) Expand all
27 #include "testing/gmock/include/gmock/gmock.h" 27 #include "testing/gmock/include/gmock/gmock.h"
28 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
29 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
30 30
31 using ::testing::AtMost; 31 using ::testing::AtMost;
32 using ::testing::NiceMock; 32 using ::testing::NiceMock;
33 using ::testing::Return; 33 using ::testing::Return;
34 using ::testing::ReturnRef; 34 using ::testing::ReturnRef;
35 using ::testing::SetArgPointee; 35 using ::testing::SetArgPointee;
36 using ::testing::_; 36 using ::testing::_;
37 using browser_sync::ProfileSyncService;
38 using browser_sync::ProfileSyncServiceMock;
37 using content::BrowserThread; 39 using content::BrowserThread;
38 40
39 // A number of distinct states of the ProfileSyncService can be generated for 41 // A number of distinct states of the ProfileSyncService can be generated for
40 // tests. 42 // tests.
41 enum DistinctState { 43 enum DistinctState {
42 STATUS_CASE_SETUP_IN_PROGRESS, 44 STATUS_CASE_SETUP_IN_PROGRESS,
43 STATUS_CASE_SETUP_ERROR, 45 STATUS_CASE_SETUP_ERROR,
44 STATUS_CASE_AUTHENTICATING, 46 STATUS_CASE_AUTHENTICATING,
45 STATUS_CASE_AUTH_ERROR, 47 STATUS_CASE_AUTH_ERROR,
46 STATUS_CASE_PROTOCOL_ERROR, 48 STATUS_CASE_PROTOCOL_ERROR,
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 // from previous one. 430 // from previous one.
429 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT; 431 status.sync_protocol_error.action = syncer::UPGRADE_CLIENT;
430 EXPECT_CALL(service, QueryDetailedSyncStatus(_)) 432 EXPECT_CALL(service, QueryDetailedSyncStatus(_))
431 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true))); 433 .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));
432 base::string16 upgrade_client_status_label; 434 base::string16 upgrade_client_status_label;
433 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin, 435 sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
434 sync_ui_util::PLAIN_TEXT, 436 sync_ui_util::PLAIN_TEXT,
435 &upgrade_client_status_label, &link_label); 437 &upgrade_client_status_label, &link_label);
436 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label); 438 EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label);
437 } 439 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | chrome/browser/sync/test/integration/bookmarks_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698