[Sync] Fixing sync_driver lint violations and adding PRESUBMIT lint check.

components/sync_driver/model_association_manager.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
 #define COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__
 
 #include <map>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 68 matching lines @@
   // |types_to_associate| should be subset of |desired_types| in Initialize().
   // When this is completed, |OnModelAssociationDone| will be invoked.
   void StartAssociationAsync(const syncer::ModelTypeSet& types_to_associate);
 
   // This is used for TESTING PURPOSE ONLY. The test case can inspect
   // and modify the timer.
   // TODO(sync) : This would go away if we made this class be able to do
   // Dependency injection. crbug.com/129212.
   base::OneShotTimer* GetTimerForTesting();
 
-   State state() const { return state_; }
+  State state() const { return state_; }
 
  private:
   // Called at the end of association to reset state to prepare for next
   // round of association.
   void ResetForNextAssociation();
 
   // Called by Initialize() to stop types that are not in |desired_types_|.
   void StopDisabledTypes();
 
   // Start loading non-running types that are in |desired_types_|.
@@ skipping 54 matching lines @@
   DataTypeManager::ConfigureStatus configure_status_;
 
   base::WeakPtrFactory<ModelAssociationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ModelAssociationManager);
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_MODEL_ASSOCIATION_MANAGER_H__