[Sync] Fixing easy lint violations.

components/sync/driver/backend_migrator_unittest.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 "components/sync/driver/backend_migrator.h"
 
+#include <memory>
+
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/tracked_objects.h"
 #include "components/sync/base/model_type_test_util.h"
 #include "components/sync/core/test/test_user_share.h"
 #include "components/sync/core/write_transaction.h"
 #include "components/sync/driver/data_type_manager_mock.h"
 #include "components/sync/driver/fake_sync_service.h"
 #include "components/sync/protocol/sync.pb.h"
-#include "components/sync/syncable/directory.h"  // TODO(tim): Remove. Bug 131130.
+#include "components/sync/syncable/directory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Eq;
 using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::Return;
 
 namespace syncer {
@@ skipping 267 matching lines @@
   EXPECT_CALL(*manager(), state())
       .WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*manager(), PurgeForMigration(_, CONFIGURE_REASON_MIGRATION))
       .Times(1);
   migrator()->MigrateTypes(to_migrate);
   SetUnsyncedTypes(ModelTypeSet());
   SendConfigureDone(DataTypeManager::ABORTED, ModelTypeSet());
   EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
 }
 
-};  // namespace browser_sync
+};  // namespace syncer