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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/sync_ui_util_unittest.cc

Issue 10694013: Shade uninitialized about:sync fields (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix one more test error Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | sync/internal_api/public/sessions/sync_session_snapshot.h » ('j') | sync/internal_api/public/sessions/sync_session_snapshot.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_ui_util_unittest.cc
diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
index 2f8ea41fcbeac27e806d82ad92c08685cb0a1d5b..8fa81383b1995dd01e7bae4eabc5c5e0f3e7044e 100644
--- a/chrome/browser/sync/sync_ui_util_unittest.cc
+++ b/chrome/browser/sync/sync_ui_util_unittest.cc
@@ -19,9 +19,11 @@
#include "ui/base/l10n/l10n_util.h"
using ::testing::AtMost;
+using ::testing::NiceMock;
using ::testing::Return;
using ::testing::ReturnRef;
-using ::testing::NiceMock;
+using ::testing::SetArgPointee;
+using ::testing::_;
using content::BrowserThread;
// A number of distinct states of the ProfileSyncService can be generated for
@@ -83,8 +85,8 @@ TEST(SyncUIUtilTest, ConstructAboutInformationWithUnrecoverableErrorTest) {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(Return(false));
EXPECT_CALL(service, HasUnrecoverableError())
.WillRepeatedly(Return(true));
@@ -107,8 +109,8 @@ TEST(SyncUIUtilTest, PassphraseGlobalError) {
NiceMock<ProfileSyncServiceMock> service(profile.get());
FakeSigninManager signin;
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillRepeatedly(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillRepeatedly(Return(false));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(true));
@@ -128,8 +130,8 @@ TEST(SyncUIUtilTest, AuthAndPassphraseGlobalError) {
NiceMock<ProfileSyncServiceMock> service(profile.get());
FakeSigninManager signin;
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillRepeatedly(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillRepeatedly(Return(false));
EXPECT_CALL(service, IsPassphraseRequired())
.WillRepeatedly(Return(true));
@@ -160,8 +162,8 @@ TEST(SyncUIUtilTest, AuthStateGlobalError) {
NiceMock<ProfileSyncServiceMock> service(profile.get());
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillRepeatedly(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillRepeatedly(Return(false));
struct {
GoogleServiceAuthError::State error_state;
@@ -204,8 +206,9 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, FirstSetupInProgress())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
EXPECT_CALL(service, GetAuthError())
.WillOnce(ReturnRef(**auth_error));
@@ -221,16 +224,18 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
.WillOnce(Return(true));
EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(false));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
return;
}
case STATUS_CASE_AUTHENTICATING: {
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
EXPECT_CALL(service, HasUnrecoverableError())
.WillOnce(Return(false));
EXPECT_CALL(signin, AuthInProgress()).WillRepeatedly(Return(true));
@@ -243,8 +248,9 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
*auth_error = new GoogleServiceAuthError(
GoogleServiceAuthError::SERVICE_UNAVAILABLE);
EXPECT_CALL(service, HasUnrecoverableError())
@@ -261,8 +267,9 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
protocolError.action = syncer::STOP_AND_RESTART_SYNC;
browser_sync::SyncBackendHost::Status status;
status.sync_protocol_error = protocolError;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
EXPECT_CALL(service, GetAuthError())
.WillOnce(ReturnRef(**auth_error));
@@ -275,8 +282,9 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
EXPECT_CALL(service, GetAuthError())
.WillOnce(ReturnRef(**auth_error));
@@ -293,8 +301,9 @@ void GetDistinctCase(ProfileSyncServiceMock& service,
EXPECT_CALL(service, HasSyncSetupCompleted())
.WillOnce(Return(true));
browser_sync::SyncBackendHost::Status status;
- EXPECT_CALL(service, QueryDetailedSyncStatus())
- .WillOnce(Return(status));
+ EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+ .WillOnce(DoAll(SetArgPointee<0>(status),
+ Return(false)));
*auth_error = new GoogleServiceAuthError(GoogleServiceAuthError::NONE);
EXPECT_CALL(service, GetAuthError())
.WillOnce(ReturnRef(**auth_error));
« no previous file with comments | « chrome/browser/sync/sync_ui_util.cc ('k') | sync/internal_api/public/sessions/sync_session_snapshot.h » ('j') | sync/internal_api/public/sessions/sync_session_snapshot.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698