summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 19:19:42 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 19:19:42 +0000
commit6ca0390061986fc68b8b2242ef6c54e710fcd34d (patch)
tree02248d249c572a66b9c159d968b4f32fd79f985b /chrome_frame
parentd63931391b29f4a940c4e6db4cea87fa3138ab3b (diff)
downloadchromium_src-6ca0390061986fc68b8b2242ef6c54e710fcd34d.zip
chromium_src-6ca0390061986fc68b8b2242ef6c54e710fcd34d.tar.gz
chromium_src-6ca0390061986fc68b8b2242ef6c54e710fcd34d.tar.bz2
Rewrite scoped_array<T> to scoped_ptr<T[]> in chrome_frame.
This is a manual cleanup pass using sed for files which are not built on Linux. BUG=171111 Review URL: https://chromiumcodereview.appspot.com/14114005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/chrome_frame_ui_test_utils.cc2
-rw-r--r--chrome_frame/test/urlmon_moniker_unittest.cc6
-rw-r--r--chrome_frame/urlmon_url_request.cc2
-rw-r--r--chrome_frame/utils.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc
index 6dcdaf7..96f6bdf 100644
--- a/chrome_frame/test/chrome_frame_ui_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc
@@ -272,7 +272,7 @@ bool AccObject::GetChildren(RefCountedAccObjectVector* client_objects) {
RefCountedAccObjectVector objects;
// Find children using |AccessibleChildren|.
- scoped_array<VARIANT> children(new VARIANT[child_count]);
+ scoped_ptr<VARIANT[]> children(new VARIANT[child_count]);
long found_child_count; // NOLINT
if (FAILED(AccessibleChildren(accessible_, 0L, child_count,
children.get(),
diff --git a/chrome_frame/test/urlmon_moniker_unittest.cc b/chrome_frame/test/urlmon_moniker_unittest.cc
index 4480e43..161636f 100644
--- a/chrome_frame/test/urlmon_moniker_unittest.cc
+++ b/chrome_frame/test/urlmon_moniker_unittest.cc
@@ -173,7 +173,7 @@ TEST_F(MonikerPatchTest, SniffDataPlayback1) {
const DWORD data_size = small_html_meta_tag.size();
DWORD read_size1 = data_size * 2;
- scoped_array<char> read_buffer1(new char[read_size1]);
+ scoped_ptr<char[]> read_buffer1(new char[read_size1]);
ZeroMemory(read_buffer1.get(), read_size1);
char read_buffer2[10] = {0};
@@ -217,8 +217,8 @@ TEST_F(MonikerPatchTest, SniffDataPlayback2) {
DWORD read_size1 = data_size / 2; // First read is half the data.
DWORD read_size2 = data_size; // Second read, try to read past data.
- scoped_array<char> read_buffer1(new char[read_size1]);
- scoped_array<char> read_buffer2(new char[read_size2]);
+ scoped_ptr<char[]> read_buffer1(new char[read_size1]);
+ scoped_ptr<char[]> read_buffer2(new char[read_size2]);
ZeroMemory(read_buffer1.get(), read_size1);
ZeroMemory(read_buffer2.get(), read_size2);
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index a6251bb..2b37d0e 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -1216,7 +1216,7 @@ void UrlmonUrlRequestManager::GetCookiesForUrl(const GURL& url, int cookie_id) {
&cookie_size);
DWORD error = 0;
if (cookie_size) {
- scoped_array<char> cookies(new char[cookie_size + 1]);
+ scoped_ptr<char[]> cookies(new char[cookie_size + 1]);
if (!InternetGetCookieA(url.spec().c_str(), NULL, cookies.get(),
&cookie_size)) {
success = false;
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 7a70e28..d7b4847 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -532,7 +532,7 @@ bool GetModuleVersion(HMODULE module, uint32* high, uint32* low) {
if (readonly_resource_data && version_resource_size) {
// Copy data as VerQueryValue tries to modify the data. This causes
// exceptions and heap corruption errors if debugger is attached.
- scoped_array<char> data(new char[version_resource_size]);
+ scoped_ptr<char[]> data(new char[version_resource_size]);
if (data.get()) {
memcpy(data.get(), readonly_resource_data, version_resource_size);
VS_FIXEDFILEINFO* ver_info = NULL;