summaryrefslogtreecommitdiffstats
path: root/base/win
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-18 14:21:58 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-18 14:21:58 +0000
commit604eb05b99b6098d36abadd2c1c2b6a1a79b705a (patch)
treea57ea3e89c68cc897af73baaf536ddfe38fda8b1 /base/win
parent64c25e10e8d8e53c536c322d274765cb93eaca77 (diff)
downloadchromium_src-604eb05b99b6098d36abadd2c1c2b6a1a79b705a.zip
chromium_src-604eb05b99b6098d36abadd2c1c2b6a1a79b705a.tar.gz
chromium_src-604eb05b99b6098d36abadd2c1c2b6a1a79b705a.tar.bz2
base: Convert scoped_arrays to the new scoped_ptr style.
BUG=109874 R=darin@chromium.org,ajwong@chromium.org Review URL: https://chromiumcodereview.appspot.com/11961021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
-rw-r--r--base/win/enum_variant.h2
-rw-r--r--base/win/win_util.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/win/enum_variant.h b/base/win/enum_variant.h
index 7cee91d..82f8750 100644
--- a/base/win/enum_variant.h
+++ b/base/win/enum_variant.h
@@ -41,7 +41,7 @@ class BASE_EXPORT EnumVariant
private:
~EnumVariant();
- scoped_array<VARIANT> items_;
+ scoped_ptr<VARIANT[]> items_;
unsigned long count_;
unsigned long current_index_;
};
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index e0d37f2..875dbad 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -83,7 +83,7 @@ bool GetUserSidString(std::wstring* user_sid) {
base::win::ScopedHandle token_scoped(token);
DWORD size = sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE;
- scoped_array<BYTE> user_bytes(new BYTE[size]);
+ scoped_ptr<BYTE[]> user_bytes(new BYTE[size]);
TOKEN_USER* user = reinterpret_cast<TOKEN_USER*>(user_bytes.get());
if (!::GetTokenInformation(token, TokenUser, user, size, &size))