diff options
25 files changed, 54 insertions, 56 deletions
diff --git a/content/browser/debugger/worker_devtools_manager.h b/content/browser/debugger/worker_devtools_manager.h index e376edc..b18f7fc 100644 --- a/content/browser/debugger/worker_devtools_manager.h +++ b/content/browser/debugger/worker_devtools_manager.h @@ -1,4 +1,4 @@ -// 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 <string> #include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "content/common/content_export.h" #include "content/browser/worker_host/worker_process_host.h" diff --git a/content/browser/download/download_buffer.h b/content/browser/download/download_buffer.h index b6a40af..35d4a56 100644 --- a/content/browser/download/download_buffer.h +++ b/content/browser/download/download_buffer.h @@ -1,4 +1,4 @@ -// 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. @@ -9,7 +9,6 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "content/common/content_export.h" @@ -38,8 +37,8 @@ CONTENT_EXPORT net::IOBuffer* AssembleData(const ContentVector& contents, // too many small write messages, each write is appended to the // |DownloadBuffer| while waiting for the task to run on the FILE // thread. Access to the write buffers is synchronized via the lock. -class CONTENT_EXPORT DownloadBuffer : - public base::RefCountedThreadSafe<DownloadBuffer> { +class CONTENT_EXPORT DownloadBuffer + : public base::RefCountedThreadSafe<DownloadBuffer> { public: DownloadBuffer(); diff --git a/content/browser/fileapi/browser_file_system_helper.h b/content/browser/fileapi/browser_file_system_helper.h index dd1490f..debe1ae 100644 --- a/content/browser/fileapi/browser_file_system_helper.h +++ b/content/browser/fileapi/browser_file_system_helper.h @@ -6,7 +6,6 @@ #define CONTENT_BROWSER_FILEAPI_BROWSER_FILE_SYSTEM_HELPER_H_ #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "webkit/fileapi/file_system_context.h" diff --git a/content/browser/geolocation/location_api_adapter_android.h b/content/browser/geolocation/location_api_adapter_android.h index 06d7195..9da98f7 100644 --- a/content/browser/geolocation/location_api_adapter_android.h +++ b/content/browser/geolocation/location_api_adapter_android.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_ -#define CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_ +#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_ +#define CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_ #pragma once +#include "base/android/jni_helper.h" #include "base/android/scoped_java_ref.h" -#include "base/synchronization/lock.h" -#include "base/memory/scoped_ptr.h" +#include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/message_loop_proxy.h" -#include "base/android/jni_helper.h" +#include "base/synchronization/lock.h" namespace content { struct Geoposition; @@ -80,4 +80,4 @@ class AndroidLocationApiAdapter { scoped_refptr<base::MessageLoopProxy> message_loop_; }; -#endif // CONTENT_BROWSER_GEOLOCATION_ANDROID_LOCATION_API_ADAPTER_H_ +#endif // CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_ diff --git a/content/browser/geolocation/location_provider_android.h b/content/browser/geolocation/location_provider_android.h index 4a86d8c..6316296 100644 --- a/content/browser/geolocation/location_provider_android.h +++ b/content/browser/geolocation/location_provider_android.h @@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_PROVIDER_ANDROID_H_ #define CONTENT_BROWSER_GEOLOCATION_LOCATION_PROVIDER_ANDROID_H_ -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" #include "content/browser/geolocation/location_provider.h" #include "content/public/common/geoposition.h" diff --git a/content/browser/geolocation/mock_location_provider.h b/content/browser/geolocation/mock_location_provider.h index 70a49ca..1fea7b9 100644 --- a/content/browser/geolocation/mock_location_provider.h +++ b/content/browser/geolocation/mock_location_provider.h @@ -7,8 +7,8 @@ #pragma once +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "content/browser/geolocation/location_provider.h" #include "content/public/common/geoposition.h" diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index a983416..5910b5d 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -9,8 +9,9 @@ #include <set> #include <string> +#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/singleton.h" #include "base/observer_list_threadsafe.h" #include "base/synchronization/lock.h" diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h index 2dd2b6c..d69651d 100644 --- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h +++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h @@ -8,8 +8,8 @@ #include <map> +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "content/public/browser/web_contents_observer.h" @@ -25,7 +25,7 @@ class RenderViewHost; // objects, one per RenderViewHost. class JavaBridgeDispatcherHostManager : public content::WebContentsObserver { public: - JavaBridgeDispatcherHostManager(content::WebContents* web_contents); + explicit JavaBridgeDispatcherHostManager(content::WebContents* web_contents); virtual ~JavaBridgeDispatcherHostManager(); // These methods add or remove the object to each JavaBridgeDispatcherHost. diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.h b/content/browser/renderer_host/x509_user_cert_resource_handler.h index 3c19a7d..12662e5 100644 --- a/content/browser/renderer_host/x509_user_cert_resource_handler.h +++ b/content/browser/renderer_host/x509_user_cert_resource_handler.h @@ -8,7 +8,8 @@ #include <string> -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "content/browser/download/download_buffer.h" #include "content/browser/renderer_host/resource_handler.h" #include "googleurl/src/gurl.h" diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.h b/content/browser/speech/input_tag_speech_dispatcher_host.h index 637ca12..c7c96edb 100644 --- a/content/browser/speech/input_tag_speech_dispatcher_host.h +++ b/content/browser/speech/input_tag_speech_dispatcher_host.h @@ -6,7 +6,8 @@ #define CONTENT_BROWSER_SPEECH_INPUT_TAG_SPEECH_DISPATCHER_HOST_H_ #pragma once -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/speech_recognition_event_listener.h" diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h index 71beae3..9a49114 100644 --- a/content/common/gpu/client/command_buffer_proxy_impl.h +++ b/content/common/gpu/client/command_buffer_proxy_impl.h @@ -15,8 +15,8 @@ #include "gpu/ipc/command_buffer_proxy.h" #include "base/callback.h" -#include "base/memory/linked_ptr.h" -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" #include "gpu/command_buffer/common/command_buffer.h" @@ -34,10 +34,10 @@ class SharedMemory; // Client side proxy that forwards messages synchronously to a // CommandBufferStub. -class CommandBufferProxyImpl : - public CommandBufferProxy, - public IPC::Channel::Listener, - public base::SupportsWeakPtr<CommandBufferProxyImpl> { +class CommandBufferProxyImpl + : public CommandBufferProxy, + public IPC::Channel::Listener, + public base::SupportsWeakPtr<CommandBufferProxyImpl> { public: typedef base::Callback<void( const std::string& msg, int id)> GpuConsoleMessageCallback; diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h index 2d2e559..bf37e38 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.h +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h @@ -7,7 +7,8 @@ #include <vector> -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "base/shared_memory.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message.h" @@ -50,7 +51,6 @@ class GpuVideoDecodeAccelerator IPC::Message* init_done_msg); private: - // Handlers for IPC messages. void OnDecode(base::SharedMemoryHandle handle, int32 id, int32 size); void OnAssignPictureBuffers( diff --git a/content/common/gpu/media/h264_parser.cc b/content/common/gpu/media/h264_parser.cc index ebed3f2..6e3712e 100644 --- a/content/common/gpu/media/h264_parser.cc +++ b/content/common/gpu/media/h264_parser.cc @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/common/gpu/media/h264_parser.h" + #include "base/logging.h" +#include "base/memory/scoped_ptr.h" #include "base/stl_util.h" -#include "content/common/gpu/media/h264_parser.h" namespace content { @@ -151,7 +153,7 @@ do { \ return kInvalidStream; \ } \ *out = _out; \ -} while(0) +} while (0) #define READ_UE_OR_RETURN(out) \ do { \ @@ -159,7 +161,7 @@ do { \ DVLOG(1) << "Error in stream: invalid value while trying to read " #out; \ return kInvalidStream; \ } \ -} while(0) +} while (0) #define READ_SE_OR_RETURN(out) \ do { \ @@ -167,7 +169,7 @@ do { \ DVLOG(1) << "Error in stream: invalid value while trying to read " #out; \ return kInvalidStream; \ } \ -} while(0) +} while (0) #define IN_RANGE_OR_RETURN(val, min, max) \ do { \ @@ -177,7 +179,7 @@ do { \ << " found " << (val) << " instead"; \ return kInvalidStream; \ } \ -} while(0) +} while (0) #define TRUE_OR_RETURN(a) \ do { \ @@ -185,7 +187,7 @@ do { \ DVLOG(1) << "Error in stream: invalid value, expected " << #a; \ return kInvalidStream; \ } \ -} while(0) +} while (0) H264Parser::H264Parser() { Reset(); @@ -225,7 +227,7 @@ static inline bool IsStartCode(const uint8* data) { // and size of found start code (3 or 4 bytes). static bool FindStartCode(const uint8* data, off_t data_size, off_t* offset, - off_t *start_code_size) { + off_t* start_code_size) { off_t bytes_left = data_size; while (bytes_left > 3) { @@ -823,7 +825,7 @@ H264Parser::Result H264Parser::ParsePPS(int* pps_id) { H264Parser::Result H264Parser::ParseRefPicListModification( int num_ref_idx_active_minus1, H264ModificationOfPicNum* ref_list_mods) { - H264ModificationOfPicNum *pic_num_mod; + H264ModificationOfPicNum* pic_num_mod; if (num_ref_idx_active_minus1 >= 32) return kInvalidStream; @@ -966,7 +968,6 @@ H264Parser::Result H264Parser::ParsePredWeightTable(const H264SPS& sps, } H264Parser::Result H264Parser::ParseDecRefPicMarking(H264SliceHeader *shdr) { - if (shdr->idr_pic_flag) { READ_BITS_OR_RETURN(1, &shdr->no_output_of_prior_pics_flag); READ_BITS_OR_RETURN(1, &shdr->long_term_reference_flag); @@ -1195,5 +1196,4 @@ H264Parser::Result H264Parser::ParseSEI(H264SEIMessage* sei_msg) { return kOk; } -} // namespace content - +} // namespace content diff --git a/content/common/gpu/media/h264_parser.h b/content/common/gpu/media/h264_parser.h index 450536d..8b346c2 100644 --- a/content/common/gpu/media/h264_parser.h +++ b/content/common/gpu/media/h264_parser.h @@ -7,10 +7,11 @@ #ifndef CONTENT_COMMON_GPU_MEDIA_H264_PARSER_H_ #define CONTENT_COMMON_GPU_MEDIA_H264_PARSER_H_ +#include <sys/types.h> + #include <map> #include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" namespace content { @@ -400,7 +401,6 @@ class H264Parser { DISALLOW_COPY_AND_ASSIGN(H264Parser); }; -} // namespace content - -#endif // CONTENT_COMMON_GPU_MEDIA_H264_PARSER_H_ +} // namespace content +#endif // CONTENT_COMMON_GPU_MEDIA_H264_PARSER_H_ diff --git a/content/common/mac/attributed_string_coder.h b/content/common/mac/attributed_string_coder.h index 40eab17c..2f0b68d 100644 --- a/content/common/mac/attributed_string_coder.h +++ b/content/common/mac/attributed_string_coder.h @@ -8,7 +8,6 @@ #include <set> -#include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "content/common/content_export.h" #include "content/common/mac/font_descriptor.h" diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h index 66a7d67..16fc5be 100644 --- a/content/gpu/gpu_watchdog_thread.h +++ b/content/gpu/gpu_watchdog_thread.h @@ -6,7 +6,6 @@ #define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/threading/thread.h" diff --git a/content/renderer/media/audio_device_thread.h b/content/renderer/media/audio_device_thread.h index 0b9f82e..adc89ef 100644 --- a/content/renderer/media/audio_device_thread.h +++ b/content/renderer/media/audio_device_thread.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "base/sync_socket.h" #include "base/synchronization/lock.h" diff --git a/content/renderer/media/media_stream_dependency_factory.h b/content/renderer/media/media_stream_dependency_factory.h index 4e6a141..57d9b3c 100644 --- a/content/renderer/media/media_stream_dependency_factory.h +++ b/content/renderer/media/media_stream_dependency_factory.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "content/common/content_export.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" #include "webkit/glue/p2p_transport.h" @@ -40,7 +39,7 @@ class VideoCaptureImplManager; // Object factory for MediaStreamImpl and PeerConnectionHandler. class CONTENT_EXPORT MediaStreamDependencyFactory { public: - MediaStreamDependencyFactory(VideoCaptureImplManager* vc_manager); + explicit MediaStreamDependencyFactory(VideoCaptureImplManager* vc_manager); virtual ~MediaStreamDependencyFactory(); // Creates and deletes |pc_factory_|, which in turn is used for diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h index 62b7b31..6615acc 100644 --- a/content/renderer/media/mock_peer_connection_impl.h +++ b/content/renderer/media/mock_peer_connection_impl.h @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/memory/scoped_ptr.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" class MockMediaStreamDependencyFactory; @@ -19,7 +20,7 @@ class MockStreamCollection; class MockPeerConnectionImpl : public PeerConnectionInterface { public: - MockPeerConnectionImpl(MockMediaStreamDependencyFactory* factory); + explicit MockPeerConnectionImpl(MockMediaStreamDependencyFactory* factory); // PeerConnectionInterface implementation. virtual void ProcessSignalingMessage(const std::string& msg) OVERRIDE; diff --git a/content/renderer/media/peer_connection_handler_base.h b/content/renderer/media/peer_connection_handler_base.h index fbb7a69..de7935d 100644 --- a/content/renderer/media/peer_connection_handler_base.h +++ b/content/renderer/media/peer_connection_handler_base.h @@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/memory/scoped_ptr.h" +#include "base/memory/ref_counted.h" #include "base/message_loop_proxy.h" #include "content/common/content_export.h" #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h" diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.h b/content/renderer/media/pepper_platform_video_decoder_impl.h index 2927277..a3c4341 100644 --- a/content/renderer/media/pepper_platform_video_decoder_impl.h +++ b/content/renderer/media/pepper_platform_video_decoder_impl.h @@ -7,7 +7,8 @@ #include <vector> -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.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/pepper/pepper_platform_audio_input_impl.h b/content/renderer/pepper/pepper_platform_audio_input_impl.h index 6b6c3b41..d83a12e 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.h +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.h @@ -8,8 +8,8 @@ #include <string> #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "content/renderer/media/audio_input_message_filter.h" #include "media/audio/audio_parameters.h" diff --git a/content/renderer/pepper/pepper_platform_context_3d_impl.h b/content/renderer/pepper/pepper_platform_context_3d_impl.h index 59fa85e..8d3a0f6 100644 --- a/content/renderer/pepper/pepper_platform_context_3d_impl.h +++ b/content/renderer/pepper/pepper_platform_context_3d_impl.h @@ -7,7 +7,8 @@ #pragma once #include "base/callback.h" -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" #include "webkit/plugins/ppapi/plugin_delegate.h" diff --git a/content/renderer/renderer_webcolorchooser_impl.h b/content/renderer/renderer_webcolorchooser_impl.h index 2048cc7..8c12e98 100644 --- a/content/renderer/renderer_webcolorchooser_impl.h +++ b/content/renderer/renderer_webcolorchooser_impl.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_RENDERER_WEBCOLORCHOOSER_IMPL_H_ #pragma once -#include "base/memory/scoped_ptr.h" +#include "base/compiler_specific.h" #include "content/public/renderer/render_view_observer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooser.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebColorChooserClient.h" diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h index e72dac9..36cac6a 100644 --- a/content/renderer/websharedworker_proxy.h +++ b/content/renderer/websharedworker_proxy.h @@ -1,4 +1,4 @@ -// 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. @@ -10,7 +10,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/memory/scoped_ptr.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h" |