Convert //components/policy from scoped_ptr to std::unique_ptr

components/policy/core/common/async_policy_provider_unittest.cc

 // Copyright 2013 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/policy/core/common/async_policy_provider.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 27 matching lines @@
            new base::StringValue(value),
            NULL);
 }
 
 class MockPolicyLoader : public AsyncPolicyLoader {
  public:
   explicit MockPolicyLoader(
       scoped_refptr<base::SequencedTaskRunner> task_runner);
   ~MockPolicyLoader() override;
 
-  // Load() returns a scoped_ptr<PolicyBundle> but it can't be mocked because
+  // Load() returns a std::unique_ptr<PolicyBundle> but it can't be mocked
+  // because

[Thiemo Nagel, 2016/04/20 20:34:19]

Please fix line wrapping and convert in-comment mentions of scoped_ptr.

[dcheng, 2016/04/20 20:56:31]

Done.

   // scoped_ptr is moveable but not copyable. This override forwards the
   // call to MockLoad() which returns a PolicyBundle*, and returns a copy
   // wrapped in a passed scoped_ptr.
-  scoped_ptr<PolicyBundle> Load() override;
+  std::unique_ptr<PolicyBundle> Load() override;
 
   MOCK_METHOD0(MockLoad, const PolicyBundle*());
   MOCK_METHOD0(InitOnBackgroundThread, void());
   MOCK_METHOD0(LastModificationTime, base::Time());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockPolicyLoader);
 };
 
 MockPolicyLoader::MockPolicyLoader(
     scoped_refptr<base::SequencedTaskRunner> task_runner)
     : AsyncPolicyLoader(task_runner) {}
 
 MockPolicyLoader::~MockPolicyLoader() {}
 
-scoped_ptr<PolicyBundle> MockPolicyLoader::Load() {
-  scoped_ptr<PolicyBundle> bundle;
+std::unique_ptr<PolicyBundle> MockPolicyLoader::Load() {
+  std::unique_ptr<PolicyBundle> bundle;
   const PolicyBundle* loaded = MockLoad();
   if (loaded) {
     bundle.reset(new PolicyBundle());
     bundle->CopyFrom(*loaded);
   }
   return bundle;
 }
 
 }  // namespace
 
 class AsyncPolicyProviderTest : public testing::Test {
  protected:
   AsyncPolicyProviderTest();
   ~AsyncPolicyProviderTest() override;
 
   void SetUp() override;
   void TearDown() override;
 
   base::MessageLoop loop_;
   SchemaRegistry schema_registry_;
   PolicyBundle initial_bundle_;
   MockPolicyLoader* loader_;
-  scoped_ptr<AsyncPolicyProvider> provider_;
+  std::unique_ptr<AsyncPolicyProvider> provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AsyncPolicyProviderTest);
 };
 
 AsyncPolicyProviderTest::AsyncPolicyProviderTest() {}
 
 AsyncPolicyProviderTest::~AsyncPolicyProviderTest() {}
 
 void AsyncPolicyProviderTest::SetUp() {
   SetPolicy(&initial_bundle_, "policy", "initial");
   loader_ = new MockPolicyLoader(loop_.task_runner());
   EXPECT_CALL(*loader_, LastModificationTime())
       .WillRepeatedly(Return(base::Time()));
   EXPECT_CALL(*loader_, InitOnBackgroundThread()).Times(1);
   EXPECT_CALL(*loader_, MockLoad()).WillOnce(Return(&initial_bundle_));
 
   provider_.reset(new AsyncPolicyProvider(
-      &schema_registry_, scoped_ptr<AsyncPolicyLoader>(loader_)));
+      &schema_registry_, std::unique_ptr<AsyncPolicyLoader>(loader_)));
   provider_->Init(&schema_registry_);
   // Verify that the initial load is done synchronously:
   EXPECT_TRUE(provider_->policies().Equals(initial_bundle_));
 
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(loader_);
 
   EXPECT_CALL(*loader_, LastModificationTime())
       .WillRepeatedly(Return(base::Time()));
 }
@@ skipping 98 matching lines @@
   EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(0);
   provider_->Shutdown();
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   provider_->RemoveObserver(&observer);
   provider_.reset();
 }
 
 }  // namespace policy