Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc

 // Copyright 2015 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/chromeos/policy/affiliated_invalidation_service_provider_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 33 matching lines @@
 const char kAffiliatedUserID1[] = "test_1@example.com";
 const char kAffiliatedUserID2[] = "test_2@example.com";
 const char kUnaffiliatedUserID[] = "test@other_domain.test";
 
 std::unique_ptr<KeyedService> BuildProfileInvalidationProvider(
     content::BrowserContext* context) {
   std::unique_ptr<invalidation::FakeInvalidationService> invalidation_service(
       new invalidation::FakeInvalidationService);
   invalidation_service->SetInvalidatorState(
       syncer::TRANSIENT_INVALIDATION_ERROR);
-  return base::WrapUnique(new invalidation::ProfileInvalidationProvider(
-      std::move(invalidation_service)));
+  return base::MakeUnique<invalidation::ProfileInvalidationProvider>(
+      std::move(invalidation_service));
 }
 
 }  // namespace
 
 // A simple AffiliatedInvalidationServiceProvider::Consumer that registers a
 // syncer::FakeInvalidationHandler with the invalidation::InvalidationService
 // that is currently being made available.
 class FakeConsumer : public AffiliatedInvalidationServiceProvider::Consumer {
  public:
   explicit FakeConsumer(AffiliatedInvalidationServiceProviderImpl* provider);
@@ skipping 608 matching lines @@
   EXPECT_EQ(0, consumer_->GetAndClearInvalidationServiceSetCount());
   provider_->Shutdown();
   EXPECT_EQ(1, consumer_->GetAndClearInvalidationServiceSetCount());
   EXPECT_EQ(nullptr, consumer_->GetInvalidationService());
 
   // Verify that the device-global invalidation service has been destroyed.
   EXPECT_FALSE(provider_->GetDeviceInvalidationServiceForTest());
 }
 
 }  // namespace policy