[USS] Fix USS in sync_integration_tests in chromeos

chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

 // Copyright 2016 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 "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 183 matching lines @@
 
 class TwoClientUssSyncTest : public SyncTest {
  public:
   TwoClientUssSyncTest() : SyncTest(TWO_CLIENT) {
     DisableVerifier();
     sync_client_factory_ = base::Bind(&TwoClientUssSyncTest::CreateSyncClient,
                                       base::Unretained(this));
     ProfileSyncServiceFactory::SetSyncClientFactoryForTest(
         &sync_client_factory_);
     ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(true);
+    // The test infra creates a profile before the two made for sync tests.
+    number_of_clients_ignored_ = 1;
+#if defined(OS_CHROMEOS)
+    // ChromeOS will force loading a signin profile, so we need to ingore one
+    // more client.
+    ++number_of_clients_ignored_;
+#endif
   }
 
   ~TwoClientUssSyncTest() override {
     ProfileSyncServiceFactory::SetSyncClientFactoryForTest(nullptr);
     ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(false);
   }
 
   bool TestUsesSelfNotifications() override { return false; }
 
   TestModelTypeSyncBridge* GetModelTypeSyncBridge(int i) {
     return bridges_.at(i).get();
   }
 
  protected:
   std::unique_ptr<syncer::SyncClient> CreateSyncClient(Profile* profile) {
-    if (!first_client_ignored_) {
-      // The test infra creates a profile before the two made for sync tests.
-      first_client_ignored_ = true;
+    if (number_of_clients_ignored_ > 0) {
+      --number_of_clients_ignored_;
       return base::MakeUnique<ChromeSyncClient>(profile);
     }
     auto bridge = base::MakeUnique<TestModelTypeSyncBridge>();
     auto client = base::MakeUnique<TestSyncClient>(profile, bridge.get());
     clients_.push_back(client.get());
     bridges_.push_back(std::move(bridge));
     return std::move(client);
   }
 
   ProfileSyncServiceFactory::SyncClientFactory sync_client_factory_;
   std::vector<std::unique_ptr<TestModelTypeSyncBridge>> bridges_;
   std::vector<TestSyncClient*> clients_;
-  bool first_client_ignored_ = false;
+  size_t number_of_clients_ignored_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientUssSyncTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, Sanity) {
   ASSERT_TRUE(SetupSync());
   ASSERT_EQ(2U, clients_.size());
   ASSERT_EQ(2U, bridges_.size());
   TestModelTypeSyncBridge* model0 = GetModelTypeSyncBridge(0);
@@ skipping 118 matching lines @@
 
   ASSERT_TRUE(DataChecker(model1, kKey1, kValue2).Wait());
   ASSERT_TRUE(DataChecker(model1, kKey2, kValue1).Wait());
   ASSERT_TRUE(DataChecker(model1, kKey4, kValue1).Wait());
 
   ASSERT_TRUE(DataChecker(model0, kKey1, kValue2).Wait());
   ASSERT_TRUE(DataChecker(model0, kKey3, kValue1).Wait());
 }
 
 }  // namespace