Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

chrome/installer/setup/setup_util_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/installer/setup/setup_util_unittest.h"
 
 #include <windows.h>
 
 #include <string>
 
@@ skipping 37 matching lines @@
 };
 
 // The privilege tested in ScopeTokenPrivilege tests below.
 // Use SE_RESTORE_NAME as it is one of the many privileges that is available,
 // but not enabled by default on processes running at high integrity.
 static const wchar_t kTestedPrivilege[] = SE_RESTORE_NAME;
 
 // Returns true if the current process' token has privilege |privilege_name|
 // enabled.
 bool CurrentProcessHasPrivilege(const wchar_t* privilege_name) {
-  HANDLE temp_handle;
+  base::win::ScopedHandle token;
   if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY,
-                          &temp_handle)) {
+                          token.Receive())) {
     ADD_FAILURE();
     return false;
   }
 
-  base::win::ScopedHandle token(temp_handle);
-
   // First get the size of the buffer needed for |privileges| below.
   DWORD size;
   EXPECT_FALSE(::GetTokenInformation(token, TokenPrivileges, NULL, 0, &size));
 
   scoped_ptr<BYTE[]> privileges_bytes(new BYTE[size]);
   TOKEN_PRIVILEGES* privileges =
       reinterpret_cast<TOKEN_PRIVILEGES*>(privileges_bytes.get());
 
   if (!::GetTokenInformation(token, TokenPrivileges, privileges, size, &size)) {
     ADD_FAILURE();
@@ skipping 401 matching lines @@
                                       BrowserDistribution::CHROME_FRAME));
   EXPECT_TRUE(chrome_frame.GetUsageStats(&usagestats));
   EXPECT_EQ(1U, usagestats);
   EXPECT_EQ(L"2.0-dev", chrome_frame.channel().value());
 
   // Confirm that the binaries' channel no longer contains GCF.
   ASSERT_TRUE(binaries.Initialize(kSystemLevel,
                                   BrowserDistribution::CHROME_BINARIES));
   EXPECT_EQ(L"2.0-dev-multi", binaries.channel().value());
 }