[Sync] Fix sync lint errors/includes, update presubmit.

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

 // Copyright 2014 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_integration_test_util.h"
 
-#include <string>
-
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/sync/test/integration/fake_server_match_status_checker.h"
 #include "components/browser_sync/profile_sync_service.h"
 
 ServerCountMatchStatusChecker::ServerCountMatchStatusChecker(
     syncer::ModelType type,
     size_t count)
     : type_(type), count_(count) {}
 
 bool ServerCountMatchStatusChecker::IsExitConditionSatisfied() {
   return count_ == fake_server()->GetSyncEntitiesByModelType(type_).size();
 }
@@ skipping 23 matching lines @@
     : SingleClientStatusChangeChecker(service) {}
 
 bool PassphraseAcceptedChecker::IsExitConditionSatisfied() {
   return !service()->IsPassphraseRequired() &&
          service()->IsUsingSecondaryPassphrase();
 }
 
 std::string PassphraseAcceptedChecker::GetDebugMessage() const {
   return "Passhrase Accepted";
 }