[sync] Display an error when sync settings aren't confirmed

chrome/browser/sync/sync_ui_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include <memory>
 
 #include <set>
 #include "base/macros.h"
@@ skipping 30 matching lines @@
 
 // A number of distinct states of the ProfileSyncService can be generated for
 // tests.
 enum DistinctState {
   STATUS_CASE_SETUP_IN_PROGRESS,
   STATUS_CASE_SETUP_ERROR,
   STATUS_CASE_AUTHENTICATING,
   STATUS_CASE_AUTH_ERROR,
   STATUS_CASE_PROTOCOL_ERROR,
   STATUS_CASE_PASSPHRASE_ERROR,
+  STATUS_CASE_CONFIRM_SYNC_SETTINGS,
   STATUS_CASE_SYNCED,
   STATUS_CASE_SYNC_DISABLED_BY_POLICY,
   NUMBER_OF_STATUS_CASES
 };
 
 namespace {
 
 const char kTestGaiaId[] = "gaia-id-test_user@test.com";
 const char kTestUser[] = "test_user@test.com";
 
@@ skipping 105 matching lines @@
       syncer::SyncProtocolError protocolError;
       protocolError.action = syncer::UPGRADE_CLIENT;
       syncer::SyncEngine::Status status;
       status.sync_protocol_error = protocolError;
       EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
           .WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
       EXPECT_CALL(*service, HasUnrecoverableError())
           .WillRepeatedly(Return(false));
       return;
     }
+    case STATUS_CASE_CONFIRM_SYNC_SETTINGS: {
+      EXPECT_CALL(*service, IsFirstSetupComplete())
+          .WillRepeatedly(Return(false));
+      EXPECT_CALL(*service, IsSyncRequested()).WillRepeatedly(Return(true));
+      EXPECT_CALL(*service, IsPassphraseRequired())
+          .WillRepeatedly(Return(false));
+      syncer::SyncEngine::Status status;
+      EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
+          .WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
+      return;
+    }
     case STATUS_CASE_PASSPHRASE_ERROR: {
       EXPECT_CALL(*service, IsFirstSetupComplete())
           .WillRepeatedly(Return(true));
       EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
       syncer::SyncEngine::Status status;
       EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
           .WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
       EXPECT_CALL(*service, HasUnrecoverableError())
           .WillRepeatedly(Return(false));
       EXPECT_CALL(*service, IsPassphraseRequired())
@@ skipping 45 matching lines @@
     case STATUS_CASE_SETUP_ERROR:
       return sync_ui_util::REAUTHENTICATE;
     case STATUS_CASE_AUTHENTICATING:
       return sync_ui_util::NO_ACTION;
     case STATUS_CASE_AUTH_ERROR:
       return sync_ui_util::REAUTHENTICATE;
     case STATUS_CASE_PROTOCOL_ERROR:
       return sync_ui_util::UPGRADE_CLIENT;
     case STATUS_CASE_PASSPHRASE_ERROR:
       return sync_ui_util::ENTER_PASSPHRASE;
+    case STATUS_CASE_CONFIRM_SYNC_SETTINGS:
+      return sync_ui_util::CONFIRM_SYNC_SETTINGS;
     case STATUS_CASE_SYNCED:
       return sync_ui_util::NO_ACTION;
     case STATUS_CASE_SYNC_DISABLED_BY_POLICY:
       return sync_ui_util::NO_ACTION;
     default:
       NOTREACHED();
       return sync_ui_util::NO_ACTION;
   }
 }
 
@@ skipping 155 matching lines @@
   sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
                                 sync_ui_util::PLAIN_TEXT,
                                 &second_actionable_error_status_label,
                                 &link_label, &action_type);
   // Expect a passive message instead of a call to action.
   EXPECT_EQ(sync_ui_util::NO_ACTION, action_type);
 
   EXPECT_NE(first_actionable_error_status_label,
             second_actionable_error_status_label);
 }
+
+TEST_F(SyncUIUtilTest, SyncSettingsConfirmationNeededTest) {

[skym, 2017/06/01 19:48:44]

Can you make a unit test that has nullptr for the labels too?

[Patrick Noland, 2017/06/07 19:07:23]

Alas, GetStatusLabels DCHECKS that link_label and status_label are non-null,
even though GetStatusInfo doesn't require that. GetStatusInfo is internal to
sync_ui_utils so there's not a good way to pass nullptr without doing a lot of
refactoring. And if I was refactoring this, I would change it so much that this
change wouldn't apply any longer. 

+  std::unique_ptr<Profile> profile(MakeSignedInTestingProfile());
+  SigninManagerBase* signin =
+      SigninManagerFactory::GetForProfile(profile.get());
+
+  ProfileSyncServiceMock service(
+      CreateProfileSyncServiceParamsForTest(profile.get()));
+  EXPECT_CALL(service, IsFirstSetupComplete()).WillRepeatedly(Return(false));
+  EXPECT_CALL(service, IsSyncRequested()).WillRepeatedly(Return(true));
+
+  base::string16 actionable_error_status_label;
+  base::string16 link_label;
+  sync_ui_util::ActionType action_type = sync_ui_util::NO_ACTION;
+
+  sync_ui_util::GetStatusLabels(
+      profile.get(), &service, *signin, sync_ui_util::PLAIN_TEXT,
+      &actionable_error_status_label, &link_label, &action_type);
+
+  EXPECT_EQ(action_type, sync_ui_util::CONFIRM_SYNC_SETTINGS);
+}