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

chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.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/ui/sync/one_click_signin_sync_observer.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/browser_sync/test_profile_sync_service.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ skipping 16 matching lines @@
  public:
   explicit MockWebContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents) {}
   virtual ~MockWebContentsObserver() {}
 
   // A hook to verify that the OneClickSigninSyncObserver initiated a redirect
   // to the continue URL. Navigations in unit_tests never complete, but a
   // navigation start is a sufficient signal for the purposes of this test.
   // Listening for this call also has the advantage of being synchronous.
   MOCK_METHOD1(DidStartNavigation, void(content::NavigationHandle*));
-  // TODO: remove this method when PlzNavigate is turned on by default.
+  // TODO(jam): remove this method when PlzNavigate is turned on by default.
   MOCK_METHOD2(DidStartNavigationToPendingEntry,
                void(const GURL&, content::ReloadType));
 };
 
 class OneClickTestProfileSyncService
     : public browser_sync::TestProfileSyncService {
  public:
   ~OneClickTestProfileSyncService() override {}
 
   // Helper routine to be used in conjunction with
@@ skipping 221 matching lines @@
   if (content::IsBrowserSideNavigationEnabled()) {
     EXPECT_CALL(*web_contents_observer_, DidStartNavigation(_)).Times(0);
     sync_service_->NotifyObservers();
   } else {
     EXPECT_CALL(*web_contents_observer_,
                 DidStartNavigationToPendingEntry(_, _)).Times(0);
     sync_service_->NotifyObservers();
   }
   EXPECT_NE(GURL(kContinueUrl), web_contents()->GetVisibleURL());
 }