Switch to standard integer types in components/, part 3 of 4.

components/password_manager/core/browser/password_syncable_service_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 "components/password_manager/core/browser/password_syncable_service.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/password_manager/core/browser/mock_password_store.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 571 matching lines @@
 
   service()->MergeDataAndStartSyncing(syncer::PASSWORDS,
                                       sync_data,
                                       processor_.Pass(),
                                       scoped_ptr<syncer::SyncErrorFactory>());
 }
 
 }  // namespace
 
 }  // namespace password_manager