diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 04:14:23 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 04:14:23 +0000 |
| commit | e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b (patch) | |
| tree | 749e2cc0ae20a323b91d7162823bf8dd7e557fad /content/renderer | |
| parent | e10f6c8060762def59918d6ae2658065e6d4a406 (diff) | |
| download | chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.zip chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.tar.gz chromium_src-e57a716e4e310ac6463c8dea3dd7c2ae2e24ec8b.tar.bz2 | |
Cleanup: base/scoped_ptr.h -> base/memory/scoped_ptr.h. (part 2)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7149008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/p2p/p2p_transport_impl.h | 6 | ||||
| -rw-r--r-- | content/renderer/pepper_platform_video_decoder_impl.h | 2 | ||||
| -rw-r--r-- | content/renderer/v8_value_converter.cc | 2 | ||||
| -rw-r--r-- | content/renderer/v8_value_converter_browsertest.cc | 2 | ||||
| -rw-r--r-- | content/renderer/webworker_base.h | 4 |
5 files changed, 9 insertions, 7 deletions
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; |