Cleanup in ios/chrome and ios/public/test.

ios/public/test/test_chrome_provider_initializer.h

 // 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.
 
 #ifndef IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_
 #define IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_
 
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+
 namespace ios {
 
 class TestChromeBrowserProvider;
 
 // Initializes various objects needed to run unit tests that use ios::
 // objects. Currently this includes setting up the chrome browser provider as
 // a |TestChromeBrowserProvider|.
 class TestChromeProviderInitializer {
  public:
   TestChromeProviderInitializer();
   virtual ~TestChromeProviderInitializer();
 
  private:
-  TestChromeBrowserProvider* chrome_browser_provider_;
+  scoped_ptr<TestChromeBrowserProvider> chrome_browser_provider_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestChromeProviderInitializer);
 };
 
 }  // namespace ios
 
 #endif  // IOS_PUBLIC_TEST_TEST_CHROME_PROVIDER_INITIALIZER_H_