Cleanup: Remove unneeded scoped_ptr.h includes from webkit.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10408078

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138426 0039d316-1c4b-4281-b951-d872f2087c98

webkit/fileapi/file_system_mount_point_provider.h

@@ -10,7 +10,6 @@
 
 #include "base/callback_forward.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "webkit/fileapi/file_system_types.h"
 

webkit/fileapi/file_system_quota_client.h

@@ -10,8 +10,9 @@
 #include <utility>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/quota_client.h"

webkit/fileapi/file_system_test_helper.h

@@ -10,7 +10,6 @@
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_path.h"
 #include "webkit/fileapi/file_system_types.h"

webkit/fileapi/isolated_context.cc

@@ -17,7 +17,7 @@ static base::LazyInstance<IsolatedContext>::Leaky g_isolated_context =
 
 // static
 IsolatedContext* IsolatedContext::GetInstance() {
-  return &g_isolated_context.Get();
+  return g_isolated_context.Pointer();
 }
 
 std::string IsolatedContext::RegisterIsolatedFileSystem(

webkit/fileapi/local_file_util.h

@@ -8,11 +8,11 @@
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_types.h"

webkit/fileapi/mock_file_system_options.h

@@ -5,9 +5,6 @@
 #ifndef WEBKIT_FILEAPI_MOCK_FILE_SYSTEM_OPTIONS_H_
 #define WEBKIT_FILEAPI_MOCK_FILE_SYSTEM_OPTIONS_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_system_options.h"
 
 namespace fileapi {

webkit/fileapi/sandbox_mount_point_provider.h

@@ -9,8 +9,9 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"

webkit/glue/cpp_bound_class.h

@@ -15,16 +15,14 @@
   See cpp_binding_example.{h|cc} for an example.
 */
 
-#ifndef WEBKIT_GLUE_CPP_BOUNDCLASS_H__
-#define WEBKIT_GLUE_CPP_BOUNDCLASS_H__
+#ifndef WEBKIT_GLUE_CPP_BOUND_CLASS_H_
+#define WEBKIT_GLUE_CPP_BOUND_CLASS_H_
 
 #include <map>
 #include <vector>
 
-#include "webkit/glue/cpp_variant.h"
-
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
+#include "webkit/glue/cpp_variant.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 namespace WebKit {
@@ -144,4 +142,4 @@ class WEBKIT_GLUE_EXPORT CppBoundClass {
 
 }  // namespace webkit_glue
 
-#endif  // CPP_BOUNDCLASS_H__
+#endif  // WEBKIT_GLUE_CPP_BOUND_CLASS_H_

webkit/glue/resource_loader_bridge.h

@@ -25,7 +25,6 @@
 #endif
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/time.h"
 #include "base/values.h"

webkit/plugins/npapi/plugin_instance.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -16,7 +16,6 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"

webkit/plugins/ppapi/host_var_tracker.h

@@ -13,7 +13,6 @@
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"

webkit/plugins/ppapi/ppb_network_monitor_private_impl.h

@@ -5,11 +5,8 @@
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_NETWORK_MONITOR_PRIVATE_IMPL_H_
 
-#include <list>
-#include <string>
-
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
 #include "ppapi/c/private/ppb_network_monitor_private.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_network_monitor_private_api.h"

webkit/plugins/ppapi/ppb_scrollbar_impl.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -7,6 +7,8 @@
 
 #include <vector>
 
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/thunk/ppb_scrollbar_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"

webkit/plugins/ppapi/ppb_video_decoder_impl.h

@@ -5,11 +5,9 @@
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_VIDEO_DECODER_IMPL_H_
 
-#include <vector>
-
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/dev/ppp_video_decoder_dev.h"
 #include "ppapi/c/pp_var.h"

webkit/plugins/ppapi/ppb_widget_impl.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -6,7 +6,7 @@
 #define WEBKIT_PLUGINS_PPAPI_PPB_WIDGET_IMPL_H_
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_widget_api.h"

webkit/tools/test_shell/image_decoder_unittest.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
-#include "base/memory/scoped_ptr.h"
 
 #include "testing/gtest/include/gtest/gtest.h"