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

ios/public/test/test_chrome_provider_initializer.h

Index: ios/public/test/test_chrome_provider_initializer.h
diff --git a/ios/public/test/test_chrome_provider_initializer.h b/ios/public/test/test_chrome_provider_initializer.h
index 268b01b2eb3b4ba7eb92574cfc5a679dd4b328b1..48080e43c8c8eea341b263c588c61c0325f689ab 100644
--- a/ios/public/test/test_chrome_provider_initializer.h
+++ b/ios/public/test/test_chrome_provider_initializer.h
@@ -5,6 +5,9 @@
 #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;
@@ -18,7 +21,9 @@ class TestChromeProviderInitializer {
   virtual ~TestChromeProviderInitializer();
 
  private:
-  TestChromeBrowserProvider* chrome_browser_provider_;
+  scoped_ptr<TestChromeBrowserProvider> chrome_browser_provider_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestChromeProviderInitializer);
 };
 
 }  // namespace ios