[Sync] Replaced ASSERT/EXPECT_TRUE/FALSE with expected/actual checks.

chrome/browser/sync/test/integration/sync_test.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 "chrome/browser/sync/test/integration/sync_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 509 matching lines @@
   return true;
 }
 
 void SyncTest::InitializeProfile(int index, Profile* profile) {
   DCHECK(profile);
   profiles_[index] = profile;
 
   // CheckInitialState() assumes that no windows are open at startup.
   browsers_[index] = new Browser(Browser::CreateParams(GetProfile(index)));
 
-  EXPECT_FALSE(GetBrowser(index) == nullptr) << "Could not create Browser "
-                                             << index << ".";
+  EXPECT_NE(nullptr, GetBrowser(index)) << "Could not create Browser " << index
+                                        << ".";

[maxbogue, 2016/10/28 23:31:00]

Don't need no stinkin' .'s round these parts (and if you use "Couldn't" it will
all fit on one line..)

[skym, 2016/10/31 15:08:18]

Removed all << "." from this file. This fits on one line without using a
contraction, so leaving "Could not".

 
   // Make sure the ProfileSyncService has been created before creating the
   // ProfileSyncServiceHarness - some tests expect the ProfileSyncService to
   // already exist.
   ProfileSyncService* profile_sync_service =
       ProfileSyncServiceFactory::GetForProfile(GetProfile(index));
 
   if (server_type_ == IN_PROCESS_FAKE_SERVER) {
     // TODO(pvalenzuela): Run the fake server via EmbeddedTestServer.
     profile_sync_service->OverrideNetworkResourcesForTest(
         base::WrapUnique<syncer::NetworkResources>(
             new fake_server::FakeServerNetworkResources(
                 fake_server_->AsWeakPtr())));
   }
 
   ProfileSyncServiceHarness::SigninType singin_type = UsingExternalServers()
           ? ProfileSyncServiceHarness::SigninType::UI_SIGNIN
           : ProfileSyncServiceHarness::SigninType::FAKE_SIGNIN;
 
   clients_[index] =
       ProfileSyncServiceHarness::Create(GetProfile(index),
                                         username_,
                                         password_,
                                         singin_type);
-  EXPECT_FALSE(GetClient(index) == nullptr) << "Could not create Client "
-                                            << index << ".";
+  EXPECT_NE(nullptr, GetClient(index)) << "Could not create Client " << index
+                                       << ".";

[maxbogue, 2016/10/28 23:31:00]

psh

[skym, 2016/10/31 15:08:18]

Done.

   InitializeInvalidations(index);
 }
 
 void SyncTest::InitializeInvalidations(int index) {
   if (UsingExternalServers()) {
     // DO NOTHING. External live sync servers use GCM to notify profiles of any
     // invalidations in sync'ed data. In this case, to notify other profiles of
     // invalidations, we use sync refresh notifications instead.
   } else if (server_type_ == IN_PROCESS_FAKE_SERVER) {
     CHECK(fake_server_.get());
@@ skipping 218 matching lines @@
   fake_factory_->SetFakeResponse(
       GaiaUrls::GetInstance()->oauth2_revoke_url(),
       "",
       net::HTTP_OK,
       net::URLRequestStatus::SUCCESS);
 }
 
 void SyncTest::SetOAuth2TokenResponse(const std::string& response_data,
                                       net::HttpStatusCode response_code,
                                       net::URLRequestStatus::Status status) {
-  ASSERT_TRUE(nullptr != fake_factory_.get());
+  ASSERT_NE(nullptr, fake_factory_.get());
   fake_factory_->SetFakeResponse(GaiaUrls::GetInstance()->oauth2_token_url(),
                                  response_data, response_code, status);
 }
 
 void SyncTest::ClearMockGaiaResponses() {
   // Clear any mock gaia responses that might have been set.
   if (fake_factory_) {
     fake_factory_->ClearFakeResponses();
     fake_factory_.reset();
   }
@@ skipping 321 matching lines @@
 
 void SyncTest::TriggerSyncForModelTypes(int index,
                                         syncer::ModelTypeSet model_types) {
   GetSyncService(index)->TriggerRefresh(model_types);
 }
 
 void SyncTest::SetPreexistingPreferencesFileContents(
     const std::string& contents) {
   preexisting_preferences_file_contents_ = contents;
 }