Rewrite scoped_array<T> to scoped_ptr<T[]> in media/ and webkit/.

This changelist was automatically generated using a clang tool.

BUG=171111

Review URL: https://codereview.chromium.org/13752002

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

11 files changed, 11 insertions, 11 deletions

diff --git a/webkit/media/buffered_data_source.h b/webkit/media/buffered_data_source.h
index 6d50c39..1c3523f 100644
--- a/webkit/media/buffered_data_source.h
+++ b/webkit/media/buffered_data_source.h
@@ -177,7 +177,7 @@ class BufferedDataSource : public media::DataSource {
   // because we want buffer to be passed into BufferedResourceLoader to be
   // always non-null. And by initializing this member with a default size we can
   // avoid creating zero-sized buffered if the first read has zero size.
-  scoped_array<uint8> intermediate_read_buffer_;
+  scoped_ptr<uint8[]> intermediate_read_buffer_;
   int intermediate_read_buffer_size_;
 
   // The message loop of the render thread.
diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index 9e77c42..92109fc 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -168,7 +168,7 @@ class BufferedDataSourceTest : public testing::Test {
   }
 
   void ReceiveData(int size) {
-    scoped_array<char> data(new char[size]);
+    scoped_ptr<char[]> data(new char[size]);
     memset(data.get(), 0xA5, size);  // Arbitrary non-zero value.
 
     loader()->didReceiveData(url_loader(), data.get(), size, size);
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index 4a917b4..9e9dbe1 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -217,7 +217,7 @@ class BufferedResourceLoaderTest : public testing::Test {
   void WriteData(int size) {
     EXPECT_CALL(*this, ProgressCallback(_));
 
-    scoped_array<char> data(new char[size]);
+    scoped_ptr<char[]> data(new char[size]);
     loader_->didReceiveData(url_loader_, data.get(), size, size);
   }
 
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.cc b/webkit/media/crypto/ppapi/clear_key_cdm.cc
index 435a982..4c0e2d5 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.cc
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.cc
@@ -187,7 +187,7 @@ void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
 void ClearKeyCdm::Client::NeedKey(const std::string& key_system,
                                   const std::string& session_id,
                                   const std::string& type,
-                                  scoped_array<uint8> init_data,
+                                  scoped_ptr<uint8[]> init_data,
                                   int init_data_length) {
   // In the current implementation of AesDecryptor, NeedKey is not used.
   // If no key is available to decrypt an input buffer, it returns kNoKey to
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index 7865b06..35f0187 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -97,7 +97,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
     void NeedKey(const std::string& key_system,
                  const std::string& session_id,
                  const std::string& type,
-                 scoped_array<uint8> init_data, int init_data_length);
+                 scoped_ptr<uint8[]> init_data, int init_data_length);
 
    private:
     Status status_;
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index ac07ba3..580c5a3 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -281,7 +281,7 @@ void PpapiDecryptor::KeyMessage(const std::string& key_system,
 void PpapiDecryptor::NeedKey(const std::string& key_system,
                              const std::string& session_id,
                              const std::string& type,
-                             scoped_array<uint8> init_data,
+                             scoped_ptr<uint8[]> init_data,
                              int init_data_size) {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   need_key_cb_.Run(key_system, session_id, type,
diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/media/crypto/ppapi_decryptor.h
index b57adf5..aad28c6 100644
--- a/webkit/media/crypto/ppapi_decryptor.h
+++ b/webkit/media/crypto/ppapi_decryptor.h
@@ -89,7 +89,7 @@ class PpapiDecryptor : public media::Decryptor {
   void NeedKey(const std::string& key_system,
                const std::string& session_id,
                const std::string& type,
-               scoped_array<uint8> init_data, int init_data_size);
+               scoped_ptr<uint8[]> init_data, int init_data_size);
 
   // Hold a reference of the plugin instance to make sure the plugin outlives
   // the |plugin_cdm_delegate_|. This is needed because |plugin_cdm_delegate_|
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index eac99c2..bd0328a 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -215,7 +215,7 @@ void ProxyDecryptor::KeyMessage(const std::string& key_system,
 void ProxyDecryptor::NeedKey(const std::string& key_system,
                              const std::string& session_id,
                              const std::string& type,
-                             scoped_array<uint8> init_data,
+                             scoped_ptr<uint8[]> init_data,
                              int init_data_size) {
   need_key_cb_.Run(key_system, session_id, type,
                    init_data.Pass(), init_data_size);
diff --git a/webkit/media/crypto/proxy_decryptor.h b/webkit/media/crypto/proxy_decryptor.h
index 8327fee..0b26dd2 100644
--- a/webkit/media/crypto/proxy_decryptor.h
+++ b/webkit/media/crypto/proxy_decryptor.h
@@ -68,7 +68,7 @@ class ProxyDecryptor {
   void NeedKey(const std::string& key_system,
                const std::string& session_id,
                const std::string& type,
-               scoped_array<uint8> init_data, int init_data_size);
+               scoped_ptr<uint8[]> init_data, int init_data_size);
 
   // Needed to create the PpapiDecryptor.
   WebKit::WebMediaPlayerClient* web_media_player_client_;
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index a193cc4..2f144ee 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -1032,7 +1032,7 @@ void WebMediaPlayerImpl::OnKeyAdded(const std::string& key_system,
 void WebMediaPlayerImpl::OnNeedKey(const std::string& key_system,
                                    const std::string& session_id,
                                    const std::string& type,
-                                   scoped_array<uint8> init_data,
+                                   scoped_ptr<uint8[]> init_data,
                                    int init_data_size) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 68e6f3c..ce09d90 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -207,7 +207,7 @@ class WebMediaPlayerImpl
   void OnNeedKey(const std::string& key_system,
                  const std::string& type,
                  const std::string& session_id,
-                 scoped_array<uint8> init_data,
+                 scoped_ptr<uint8[]> init_data,
                  int init_data_size);
   void SetOpaque(bool);