diff options
31 files changed, 62 insertions, 45 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index e6b49ac8..b0526f4 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -11,9 +11,9 @@ #include "base/debug/alias.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/message_pump_default.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/thread_local.h" #include "base/time.h" diff --git a/base/metrics/histogram_unittest.cc b/base/metrics/histogram_unittest.cc index 9d671df..5237f33 100644 --- a/base/metrics/histogram_unittest.cc +++ b/base/metrics/histogram_unittest.cc @@ -4,8 +4,11 @@ // Test of Histogram class +#include <algorithm> +#include <vector> + +#include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" -#include "base/scoped_ptr.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/utf_offset_string_conversions.cc b/base/utf_offset_string_conversions.cc index e5f8c81..26d28f5 100644 --- a/base/utf_offset_string_conversions.cc +++ b/base/utf_offset_string_conversions.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/utf_string_conversion_utils.h" diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h index bb003c8..568752c 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.h +++ b/content/browser/renderer_host/p2p/socket_host_tcp.h @@ -5,10 +5,12 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_ #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_H_ +#include <vector> + #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "content/browser/renderer_host/p2p/socket_host.h" #include "content/common/p2p_sockets.h" #include "net/base/completion_callback.h" diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h index 6b4a83a..cab922c 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h +++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h @@ -6,10 +6,11 @@ #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_TCP_SERVER_H_ #include <map> +#include <vector> #include "base/compiler_specific.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "content/browser/renderer_host/p2p/socket_host.h" #include "content/common/p2p_sockets.h" #include "net/socket/tcp_server_socket.h" diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h index ce6b5d7..90457a3 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.h +++ b/content/browser/renderer_host/p2p/socket_host_udp.h @@ -6,11 +6,12 @@ #define CONTENT_BROWSER_RENDERER_HOST_P2P_SOCKET_HOST_UDP_H_ #include <set> +#include <vector> #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "content/browser/renderer_host/p2p/socket_host.h" #include "content/common/p2p_sockets.h" #include "net/base/ip_endpoint.h" diff --git a/content/common/gpu/transport_texture.h b/content/common/gpu/transport_texture.h index bf31074..c3291d2 100644 --- a/content/common/gpu/transport_texture.h +++ b/content/common/gpu/transport_texture.h @@ -15,7 +15,7 @@ #include <map> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "ipc/ipc_channel.h" @@ -30,7 +30,7 @@ class GLES2Decoder; class TransportTexture : public IPC::Channel::Listener { public: enum Format { - RGBA, // GL_RGBA + RGBA, // GL_RGBA }; // |channel| is the owner of this object. diff --git a/content/ppapi_plugin/ppapi_webkitclient_impl.h b/content/ppapi_plugin/ppapi_webkitclient_impl.h index 5c3b90e..d2d8c17 100644 --- a/content/ppapi_plugin/ppapi_webkitclient_impl.h +++ b/content/ppapi_plugin/ppapi_webkitclient_impl.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "webkit/glue/webkitclient_impl.h" class PpapiWebKitClientImpl : public webkit_glue::WebKitClientImpl { diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h index e427820..2f0becd 100644 --- a/content/renderer/p2p/p2p_transport_impl.h +++ b/content/renderer/p2p/p2p_transport_impl.h @@ -5,8 +5,10 @@ #ifndef CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_ #define CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_ +#include <string> + #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "third_party/libjingle/source/talk/base/sigslot.h" #include "webkit/glue/p2p_transport.h" @@ -43,7 +45,7 @@ class P2PTransportImpl : public webkit_glue::P2PTransport, // Creates P2PTransportImpl using specified // P2PSocketDispatcher. This constructor creates IpcNetworkManager // and IpcPacketSocketFactory, and keeps ownership of these objects. - P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher); + explicit P2PTransportImpl(P2PSocketDispatcher* socket_dispatcher); virtual ~P2PTransportImpl(); diff --git a/content/renderer/pepper_platform_video_decoder_impl.h b/content/renderer/pepper_platform_video_decoder_impl.h index eb8bf4e..c119437 100644 --- a/content/renderer/pepper_platform_video_decoder_impl.h +++ b/content/renderer/pepper_platform_video_decoder_impl.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/scoped_ptr.h" #include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "media/video/video_decode_accelerator.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/content/renderer/v8_value_converter.cc b/content/renderer/v8_value_converter.cc index cefbea8..d2c21cd 100644 --- a/content/renderer/v8_value_converter.cc +++ b/content/renderer/v8_value_converter.cc @@ -7,7 +7,7 @@ #include <string> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "v8/include/v8.h" diff --git a/content/renderer/v8_value_converter_browsertest.cc b/content/renderer/v8_value_converter_browsertest.cc index 650927f..73edf47 100644 --- a/content/renderer/v8_value_converter_browsertest.cc +++ b/content/renderer/v8_value_converter_browsertest.cc @@ -4,7 +4,7 @@ #include <cmath> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "content/renderer/v8_value_converter.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/renderer/webworker_base.h b/content/renderer/webworker_base.h index 76f5868..37193ae 100644 --- a/content/renderer/webworker_base.h +++ b/content/renderer/webworker_base.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "ipc/ipc_channel.h" class ChildThread; diff --git a/content/worker/webworker_stub.h b/content/worker/webworker_stub.h index 06b4b10..466e4ba 100644 --- a/content/worker/webworker_stub.h +++ b/content/worker/webworker_stub.h @@ -6,7 +6,9 @@ #define CONTENT_WORKER_WEBWORKER_STUB_H_ #pragma once -#include "base/scoped_ptr.h" +#include <vector> + +#include "base/memory/scoped_ptr.h" #include "content/worker/webworker_stub_base.h" #include "content/worker/webworkerclient_proxy.h" #include "googleurl/src/gurl.h" diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h index eb438fa..48f993c 100644 --- a/gpu/gles2_conform_support/egl/display.h +++ b/gpu/gles2_conform_support/egl/display.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef GPU_GLES2_CONFORM_TEST_DISPLAY_H_ -#define GPU_GLES2_CONFORM_TEST_DISPLAY_H_ +#ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ +#define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ #include <EGL/egl.h> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace gpu { class CommandBufferService; @@ -74,4 +74,4 @@ class Display { } // namespace egl -#endif // GPU_GLES2_CONFORM_TEST_DISPLAY_H_ +#endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ diff --git a/net/base/escape.cc b/net/base/escape.cc index 08eebfa..7dd0ba2 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" diff --git a/net/curvecp/client_packetizer.h b/net/curvecp/client_packetizer.h index b5ca5dd..ff2a400 100644 --- a/net/curvecp/client_packetizer.h +++ b/net/curvecp/client_packetizer.h @@ -6,7 +6,7 @@ #define NET_CURVECP_CLIENT_PACKETIZER_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/curvecp/packetizer.h b/net/curvecp/packetizer.h index 30d6c29..cca680b 100644 --- a/net/curvecp/packetizer.h +++ b/net/curvecp/packetizer.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "net/curvecp/connection_key.h" diff --git a/net/proxy/init_proxy_resolver.h b/net/proxy/init_proxy_resolver.h index 89e20c3..7d8ebbc 100644 --- a/net/proxy/init_proxy_resolver.h +++ b/net/proxy/init_proxy_resolver.h @@ -8,10 +8,10 @@ #include <vector> +#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/time.h" #include "base/timer.h" -#include "base/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/base/net_api.h" diff --git a/net/socket/server_socket.h b/net/socket/server_socket.h index 2f86c3f..8a2d258 100644 --- a/net/socket/server_socket.h +++ b/net/socket/server_socket.h @@ -5,7 +5,7 @@ #ifndef NET_SOCKET_SERVER_SOCKET_H_ #define NET_SOCKET_SERVER_SOCKET_H_ -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/completion_callback.h" #include "net/base/net_api.h" @@ -37,4 +37,4 @@ class NET_API ServerSocket { } // namespace net -#endif // NET_SOCKET_TCP_SERVER_SOCKET_H_ +#endif // NET_SOCKET_SERVER_SOCKET_H_ diff --git a/net/socket/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h index ed71514..3282772 100644 --- a/net/socket/tcp_client_socket_win.h +++ b/net/socket/tcp_client_socket_win.h @@ -8,7 +8,7 @@ #include <winsock2.h> -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" diff --git a/net/socket/tcp_server_socket_libevent.h b/net/socket/tcp_server_socket_libevent.h index 360ec09..c00158b 100644 --- a/net/socket/tcp_server_socket_libevent.h +++ b/net/socket/tcp_server_socket_libevent.h @@ -5,8 +5,8 @@ #ifndef NET_SOCKET_TCP_SERVER_SOCKET_LIBEVENT_H_ #define NET_SOCKET_TCP_SERVER_SOCKET_LIBEVENT_H_ +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/base/completion_callback.h" #include "net/base/net_log.h" diff --git a/net/socket/tcp_server_socket_unittest.cc b/net/socket/tcp_server_socket_unittest.cc index c14f22e..5b5b9f5 100644 --- a/net/socket/tcp_server_socket_unittest.cc +++ b/net/socket/tcp_server_socket_unittest.cc @@ -4,8 +4,10 @@ #include "net/socket/tcp_server_socket.h" +#include <string> + #include "base/compiler_specific.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "net/base/address_list.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" diff --git a/net/socket/tcp_server_socket_win.h b/net/socket/tcp_server_socket_win.h index 2b49e22..b78bb8e 100644 --- a/net/socket/tcp_server_socket_win.h +++ b/net/socket/tcp_server_socket_win.h @@ -7,8 +7,8 @@ #include <winsock2.h> +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/win/object_watcher.h" #include "base/threading/non_thread_safe.h" #include "net/base/net_log.h" diff --git a/remoting/base/encoder_vp8_unittest.cc b/remoting/base/encoder_vp8_unittest.cc index 9435cd1..0be53d5 100644 --- a/remoting/base/encoder_vp8_unittest.cc +++ b/remoting/base/encoder_vp8_unittest.cc @@ -6,7 +6,7 @@ #include <vector> #include "base/callback.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "remoting/base/capture_data.h" #include "remoting/base/codec_test.h" #include "remoting/base/encoder_vp8.h" diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index a24c8aa..bcaaf02 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/task.h" #include "remoting/host/capturer_fake.h" #include "remoting/host/chromoting_host.h" diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h index 0c36463..2735b9d 100644 --- a/webkit/fileapi/file_system_directory_database.h +++ b/webkit/fileapi/file_system_directory_database.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H -#define WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H +#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_ +#define WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_ #include <string> #include <vector> #include "base/file_path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/time.h" #include "third_party/leveldb/include/leveldb/db.h" @@ -51,7 +51,7 @@ class FileSystemDirectoryDatabase { base::Time modification_time; }; - FileSystemDirectoryDatabase(const FilePath& path); + explicit FileSystemDirectoryDatabase(const FilePath& path); ~FileSystemDirectoryDatabase(); bool GetChildWithName( @@ -98,4 +98,4 @@ class FileSystemDirectoryDatabase { } // namespace fileapi -#endif // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H +#endif // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_ diff --git a/webkit/fileapi/file_system_file_util.cc b/webkit/fileapi/file_system_file_util.cc index 5e5e973..fbd273e 100644 --- a/webkit/fileapi/file_system_file_util.cc +++ b/webkit/fileapi/file_system_file_util.cc @@ -5,10 +5,11 @@ #include "webkit/fileapi/file_system_file_util.h" #include <stack> +#include <vector> #include "base/file_util_proxy.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "webkit/fileapi/file_system_operation_context.h" namespace fileapi { @@ -26,7 +27,7 @@ bool ParentExists(FileSystemOperationContext* context, return file_util->DirectoryExists(context, parent); } -} +} // namespace // static FileSystemFileUtil* FileSystemFileUtil::GetInstance() { @@ -205,8 +206,9 @@ PlatformFileError FileSystemFileUtil::Delete( return DeleteSingleDirectory(context, file_path); else return DeleteDirectoryRecursive(context, file_path); - } else + } else { return DeleteFile(context, file_path); + } } PlatformFileError FileSystemFileUtil::Touch( diff --git a/webkit/fileapi/file_system_origin_database.h b/webkit/fileapi/file_system_origin_database.h index 885d165..63a4b815 100644 --- a/webkit/fileapi/file_system_origin_database.h +++ b/webkit/fileapi/file_system_origin_database.h @@ -10,7 +10,7 @@ #include <vector> #include "base/file_path.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "third_party/leveldb/include/leveldb/db.h" namespace fileapi { @@ -30,7 +30,7 @@ class FileSystemOriginDatabase { // Only one instance of FileSystemOriginDatabase should exist for a given path // at a given time. - FileSystemOriginDatabase(const FilePath& path); + explicit FileSystemOriginDatabase(const FilePath& path); ~FileSystemOriginDatabase(); bool HasOriginPath(const std::string& origin); diff --git a/webkit/plugins/ppapi/webkit_forwarding_impl.cc b/webkit/plugins/ppapi/webkit_forwarding_impl.cc index 238ba04..1a4c7ba 100644 --- a/webkit/plugins/ppapi/webkit_forwarding_impl.cc +++ b/webkit/plugins/ppapi/webkit_forwarding_impl.cc @@ -4,7 +4,9 @@ #include "webkit/plugins/ppapi/webkit_forwarding_impl.h" -#include "base/scoped_ptr.h" +#include <string> + +#include "base/memory/scoped_ptr.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc index 5880411..060f2c63 100644 --- a/webkit/quota/mock_storage_client.cc +++ b/webkit/quota/mock_storage_client.cc @@ -6,9 +6,9 @@ #include "base/atomic_sequence_num.h" #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop_proxy.h" -#include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "net/base/net_util.h" #include "webkit/quota/quota_manager.h" |