diff options
21 files changed, 47 insertions, 79 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index e8d722b..f1670cc 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -859,7 +859,7 @@ scoped_ptr<net::test_server::HttpResponse> EmptyResponseHandler( new EmptyHttpResponse); } - return scoped_ptr<net::test_server::HttpResponse>(NULL); + return scoped_ptr<net::test_server::HttpResponse>(); } // Handles |request| by serving a redirect response. @@ -868,7 +868,7 @@ scoped_ptr<net::test_server::HttpResponse> RedirectResponseHandler( const GURL& redirect_target, const net::test_server::HttpRequest& request) { if (!StartsWithASCII(path, request.relative_url, true)) - return scoped_ptr<net::test_server::HttpResponse>(NULL); + return scoped_ptr<net::test_server::HttpResponse>(); scoped_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); diff --git a/content/browser/devtools/devtools_protocol.cc b/content/browser/devtools/devtools_protocol.cc index 27f1fbe..829f44e 100644 --- a/content/browser/devtools/devtools_protocol.cc +++ b/content/browser/devtools/devtools_protocol.cc @@ -125,11 +125,7 @@ DevToolsProtocol::Response::Response(int id, DictionaryValue* result) DevToolsProtocol::Response::Response(int id, int error_code, const std::string& error_message) - : id_(id), - result_(NULL), - error_code_(error_code), - error_message_(error_message) { -} + : id_(id), error_code_(error_code), error_message_(error_message) {} DevToolsProtocol::Response::~Response() { } diff --git a/content/browser/download/download_file_unittest.cc b/content/browser/download/download_file_unittest.cc index f92bb02..604baa4 100644 --- a/content/browser/download/download_file_unittest.cc +++ b/content/browser/download/download_file_unittest.cc @@ -131,16 +131,15 @@ class DownloadFileTest : public testing::Test { scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo()); download_file_.reset( - new DownloadFileImpl( - save_info.Pass(), - base::FilePath(), - GURL(), // Source - GURL(), // Referrer - calculate_hash, - scoped_ptr<ByteStreamReader>(input_stream_), - net::BoundNetLog(), - scoped_ptr<PowerSaveBlocker>(NULL).Pass(), - observer_factory_.GetWeakPtr())); + new DownloadFileImpl(save_info.Pass(), + base::FilePath(), + GURL(), // Source + GURL(), // Referrer + calculate_hash, + scoped_ptr<ByteStreamReader>(input_stream_), + net::BoundNetLog(), + scoped_ptr<PowerSaveBlocker>().Pass(), + observer_factory_.GetWeakPtr())); EXPECT_CALL(*input_stream_, Read(_, _)) .WillOnce(Return(ByteStreamReader::STREAM_EMPTY)) diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index 2578b38..e5de5df 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.cc @@ -94,9 +94,12 @@ IN_PROC_BROWSER_TEST_F(DragDownloadFileTest, DragDownloadFileTest_NetError) { "download-test.lib")))); Referrer referrer; std::string referrer_encoding; - DragDownloadFile* file = new DragDownloadFile( - name, scoped_ptr<net::FileStream>(NULL), url, referrer, - referrer_encoding, shell()->web_contents()); + DragDownloadFile* file = new DragDownloadFile(name, + scoped_ptr<net::FileStream>(), + url, + referrer, + referrer_encoding, + shell()->web_contents()); scoped_refptr<MockDownloadFileObserver> observer( new MockDownloadFileObserver()); EXPECT_CALL(*observer.get(), OnDownloadAborted()) diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index 5be2d4a..f2f4433 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -252,7 +252,7 @@ scoped_ptr<net::test_server::HttpResponse> NoContentResponseHandler( const std::string& path, const net::test_server::HttpRequest& request) { if (!StartsWithASCII(path, request.relative_url, true)) - return scoped_ptr<net::test_server::HttpResponse>(NULL); + return scoped_ptr<net::test_server::HttpResponse>(); scoped_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); diff --git a/content/browser/net/sqlite_persistent_cookie_store.cc b/content/browser/net/sqlite_persistent_cookie_store.cc index ebe41ed..12cfd62 100644 --- a/content/browser/net/sqlite_persistent_cookie_store.cc +++ b/content/browser/net/sqlite_persistent_cookie_store.cc @@ -76,7 +76,6 @@ class SQLitePersistentCookieStore::Backend bool restore_old_session_cookies, quota::SpecialStoragePolicy* special_storage_policy) : path_(path), - db_(NULL), num_pending_(0), force_keep_session_state_(false), initialized_(false), @@ -87,8 +86,7 @@ class SQLitePersistentCookieStore::Backend client_task_runner_(client_task_runner), background_task_runner_(background_task_runner), num_priority_waiting_(0), - total_priority_requests_(0) { - } + total_priority_requests_(0) {} // Creates or loads the SQLite database. void Load(const LoadedCallback& loaded_callback); diff --git a/content/browser/plugin_data_remover_impl.cc b/content/browser/plugin_data_remover_impl.cc index 90f161d..a38f478 100644 --- a/content/browser/plugin_data_remover_impl.cc +++ b/content/browser/plugin_data_remover_impl.cc @@ -69,8 +69,7 @@ class PluginDataRemoverImpl::Context begin_time_(begin_time), is_removing_(false), browser_context_path_(browser_context->GetPath()), - resource_context_(browser_context->GetResourceContext()), - channel_(NULL) { + resource_context_(browser_context->GetResourceContext()) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); } diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 8436975..116ee35 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -170,7 +170,6 @@ RenderViewHostImpl::RenderViewHostImpl( enabled_bindings_(0), pending_request_id_(-1), navigations_suspended_(false), - suspended_nav_params_(NULL), has_accessed_initial_document_(false), is_swapped_out_(swapped_out), is_subframe_(false), diff --git a/content/browser/renderer_host/touchpad_tap_suppression_controller.cc b/content/browser/renderer_host/touchpad_tap_suppression_controller.cc index 4f43696..0e8ee71 100644 --- a/content/browser/renderer_host/touchpad_tap_suppression_controller.cc +++ b/content/browser/renderer_host/touchpad_tap_suppression_controller.cc @@ -14,9 +14,7 @@ namespace content { TouchpadTapSuppressionController::TouchpadTapSuppressionController( RenderWidgetHostImpl* /*rwhv*/) - : render_widget_host_(NULL), - controller_(NULL) { -} + : render_widget_host_(NULL) {} TouchpadTapSuppressionController::~TouchpadTapSuppressionController() {} diff --git a/content/browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc b/content/browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc index 86c0d68..edc1f41 100644 --- a/content/browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc +++ b/content/browser/renderer_host/touchscreen_tap_suppression_controller_stub.cc @@ -13,9 +13,7 @@ namespace content { TouchscreenTapSuppressionController::TouchscreenTapSuppressionController( GestureEventFilter* /*gef*/) - : gesture_event_filter_(NULL), - controller_(NULL) { -} + : gesture_event_filter_(NULL) {} TouchscreenTapSuppressionController::~TouchscreenTapSuppressionController() {} diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index ecd265d..e393645 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -29,7 +29,7 @@ scoped_ptr<net::test_server::HttpResponse> HandleEchoTitleRequest( const std::string& echotitle_path, const net::test_server::HttpRequest& request) { if (!StartsWithASCII(request.relative_url, echotitle_path, true)) - return scoped_ptr<net::test_server::HttpResponse>(NULL); + return scoped_ptr<net::test_server::HttpResponse>(); scoped_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc index a1ea574..8097907 100644 --- a/content/browser/speech/google_streaming_remote_engine.cc +++ b/content/browser/speech/google_streaming_remote_engine.cc @@ -94,12 +94,10 @@ const int GoogleStreamingRemoteEngine::kWebserviceStatusErrorNoMatch = 5; GoogleStreamingRemoteEngine::GoogleStreamingRemoteEngine( net::URLRequestContextGetter* context) : url_context_(context), - encoder_(NULL), previous_response_length_(0), got_last_definitive_result_(false), is_dispatching_event_(false), - state_(STATE_IDLE) { -} + state_(STATE_IDLE) {} GoogleStreamingRemoteEngine::~GoogleStreamingRemoteEngine() {} diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc index 43b6ce1..7983216 100644 --- a/content/common/cc_messages.cc +++ b/content/common/cc_messages.cc @@ -379,7 +379,7 @@ static scoped_ptr<cc::DrawQuad> ReadDrawQuad(const Message* m, PickleIterator* iter) { scoped_ptr<QuadType> quad = QuadType::Create(); if (!ReadParam(m, iter, quad.get())) - return scoped_ptr<QuadType>(NULL).template PassAs<cc::DrawQuad>(); + return scoped_ptr<QuadType>().template PassAs<cc::DrawQuad>(); return quad.template PassAs<cc::DrawQuad>(); } diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index 8c040c2..6bda5b84 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -38,10 +38,10 @@ GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread, shutdown_event_(shutdown_event), gpu_child_thread_(gpu_child_thread), gpu_memory_manager_( - this, GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit), + this, + GpuMemoryManager::kDefaultMaxSurfacesWithFrontbufferSoftLimit), watchdog_(watchdog), - sync_point_manager_(new SyncPointManager), - program_cache_(NULL) { + sync_point_manager_(new SyncPointManager) { DCHECK(gpu_child_thread); DCHECK(io_message_loop); DCHECK(shutdown_event); diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc index 743ce21..2c601c9 100644 --- a/content/common/gpu/gpu_memory_manager_unittest.cc +++ b/content/common/gpu/gpu_memory_manager_unittest.cc @@ -80,11 +80,10 @@ class FakeClient : public GpuMemoryManagerClient { // This will create a client with no surface FakeClient(GpuMemoryManager* memmgr, GpuMemoryManagerClient* share_group) - : memmgr_(memmgr) - , total_gpu_memory_(0) - , share_group_(share_group) - , memory_tracker_(NULL) - , tracking_group_(NULL) { + : memmgr_(memmgr), + total_gpu_memory_(0), + share_group_(share_group), + memory_tracker_(NULL) { if (!share_group_) { memory_tracker_ = new FakeMemoryTracker(); tracking_group_.reset( @@ -94,14 +93,11 @@ class FakeClient : public GpuMemoryManagerClient { } // This will create a client with a surface - FakeClient(GpuMemoryManager* memmgr, - int32 surface_id, - bool visible) - : memmgr_(memmgr) - , total_gpu_memory_(0) - , share_group_(NULL) - , memory_tracker_(NULL) - , tracking_group_(NULL) { + FakeClient(GpuMemoryManager* memmgr, int32 surface_id, bool visible) + : memmgr_(memmgr), + total_gpu_memory_(0), + share_group_(NULL), + memory_tracker_(NULL) { memory_tracker_ = new FakeMemoryTracker(); tracking_group_.reset( memmgr_->CreateTrackingGroup(0, memory_tracker_.get())); diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc index 1d9afd4..f3bc4b8 100644 --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc @@ -55,13 +55,11 @@ static bool MakeDecoderContextCurrent( return true; } -GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator( - int32 host_route_id, - GpuCommandBufferStub* stub) +GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator(int32 host_route_id, + GpuCommandBufferStub* stub) : init_done_msg_(NULL), host_route_id_(host_route_id), stub_(stub), - video_decode_accelerator_(NULL), texture_target_(0) { DCHECK(stub_); stub_->AddDestructionObserver(this); diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc index cea76c5..64faf53 100644 --- a/content/public/test/test_renderer_host.cc +++ b/content/public/test/test_renderer_host.cc @@ -74,9 +74,7 @@ RenderViewHostTestEnabler::~RenderViewHostTestEnabler() { // RenderViewHostTestHarness -------------------------------------------------- RenderViewHostTestHarness::RenderViewHostTestHarness() - : contents_(NULL), - thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) { -} + : thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) {} RenderViewHostTestHarness::~RenderViewHostTestHarness() { } diff --git a/content/renderer/device_orientation_dispatcher.cc b/content/renderer/device_orientation_dispatcher.cc index 4776edf..6249476 100644 --- a/content/renderer/device_orientation_dispatcher.cc +++ b/content/renderer/device_orientation_dispatcher.cc @@ -13,10 +13,7 @@ namespace content { DeviceOrientationDispatcher::DeviceOrientationDispatcher( RenderViewImpl* render_view) - : RenderViewObserver(render_view), - controller_(NULL), - started_(false) { -} + : RenderViewObserver(render_view), started_(false) {} DeviceOrientationDispatcher::~DeviceOrientationDispatcher() { if (started_) diff --git a/content/renderer/v8_value_converter_impl_unittest.cc b/content/renderer/v8_value_converter_impl_unittest.cc index ad9232b..934d8e3 100644 --- a/content/renderer/v8_value_converter_impl_unittest.cc +++ b/content/renderer/v8_value_converter_impl_unittest.cc @@ -365,7 +365,7 @@ TEST_F(V8ValueConverterImplTest, WeirdTypes) { TestWeirdType(converter, v8::Undefined(), base::Value::TYPE_NULL, // Arbitrary type, result is NULL. - scoped_ptr<base::Value>(NULL)); + scoped_ptr<base::Value>()); TestWeirdType(converter, v8::Date::New(1000), base::Value::TYPE_DICTIONARY, diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc index 9f88766..8df887e 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/shell_browser_main_parts.cc @@ -77,16 +77,7 @@ base::StringPiece PlatformResourceProvider(int key) { ShellBrowserMainParts::ShellBrowserMainParts( const MainFunctionParams& parameters) - : BrowserMainParts(), - parameters_(parameters), - run_message_loop_(true), - devtools_delegate_(NULL) -#if defined(ENABLE_PLUGINS) - , - plugin_service_filter_(NULL) -#endif -{ -} + : BrowserMainParts(), parameters_(parameters), run_message_loop_(true) {} ShellBrowserMainParts::~ShellBrowserMainParts() { } diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 5ee9c2f..03f5ef6 100644 --- a/content/worker/websharedworker_stub.cc +++ b/content/worker/websharedworker_stub.cc @@ -19,14 +19,14 @@ namespace content { WebSharedWorkerStub::WebSharedWorkerStub( - const string16& name, int route_id, + const string16& name, + int route_id, const WorkerAppCacheInitInfo& appcache_init_info) : route_id_(route_id), appcache_init_info_(appcache_init_info), client_(route_id, this), name_(name), - started_(false), - worker_devtools_agent_(NULL) { + started_(false) { WorkerThread* worker_thread = WorkerThread::current(); DCHECK(worker_thread); |