windows: Fix a few things clang complains about.

chrome/installer/util/shell_util.cc

 // 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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 340 matching lines @@
 }
 
 // This method checks if Chrome is already registered on the local machine.
 // It gets all the required registry entries for Chrome and then checks if
 // they exist in HKLM. Returns true if all the entries exist, otherwise false.
 bool IsChromeRegistered(BrowserDistribution* dist,
                         const std::wstring& chrome_exe,
                         const std::wstring& suffix) {
   bool registered = true;
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   RegistryEntry::GetProgIdEntries(dist, chrome_exe, suffix, &entries);
   RegistryEntry::GetSystemEntries(dist, chrome_exe, suffix, &entries);
   for (std::list<RegistryEntry*>::const_iterator itr = entries.begin();
        itr != entries.end() && registered; ++itr) {
     // We do not need registered = registered && ... since the loop condition
     // is set to exit early.
     registered = (*itr)->ExistsInHKLM();
   }
   return registered;
 }
 
 // This method checks if Chrome is already registered on the local machine
 // for the requested protocol. It just checks the one value required for this.
 bool IsChromeRegisteredForProtocol(BrowserDistribution* dist,
                                    const std::wstring& suffix,
                                    const std::wstring& protocol) {
   bool registered = true;
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol, &entries);
   for (std::list<RegistryEntry*>::const_iterator itr = entries.begin();
        itr != entries.end() && registered; ++itr) {
     // We do not need registered = registered && ... since the loop condition
     // is set to exit early.
     registered = (*itr)->ExistsInHKLM();
   }
   return registered;
 }
 
@@ skipping 134 matching lines @@
     L"https", NULL};
 const wchar_t* ShellUtil::kPotentialProtocolAssociations[] = {L"ftp", L"http",
     L"https", L"irc", L"mailto", L"mms", L"news", L"nntp", L"sms", L"smsto",
     L"tel", L"urn", L"webcal", NULL};
 const wchar_t* ShellUtil::kRegUrlProtocol = L"URL Protocol";
 
 bool ShellUtil::AdminNeededForRegistryCleanup(BrowserDistribution* dist,
                                               const std::wstring& suffix) {
   bool cleanup_needed = false;
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   RegistryEntry::GetProgIdEntries(dist, L"chrome.exe", suffix, &entries);
   RegistryEntry::GetSystemEntries(dist, L"chrome.exe", suffix, &entries);
   for (std::list<RegistryEntry*>::const_iterator itr = entries.begin();
        itr != entries.end() && !cleanup_needed; ++itr) {
     cleanup_needed = (*itr)->NameExistsInHKLM();
   }
   return cleanup_needed;
 }
 
 bool ShellUtil::CreateChromeDesktopShortcut(BrowserDistribution* dist,
@@ skipping 250 matching lines @@
       }
     }
   }
 
   // Now use the old way to associate Chrome with supported protocols and file
   // associations. This should not be required on Vista but since some
   // applications still read Software\Classes\http key directly, we have to do
   // this on Vista also.
 
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   std::wstring suffix;
   if (!GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
     suffix = L"";
   RegistryEntry::GetUserEntries(dist, chrome_exe, suffix, &entries);
   // Change the default browser for current user.
   if ((shell_change & ShellUtil::CURRENT_USER) &&
       !AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
     ret = false;
     LOG(ERROR) << "Could not make Chrome default browser (XP/current user).";
   }
@@ skipping 42 matching lines @@
       LOG(ERROR) << "Could not make Chrome default protocol client (Vista):"
                  << " HRESULT=" << hr << ".";
     }
   }
 
   // Now use the old way to associate Chrome with the desired protocol. This
   // should not be required on Vista but since some applications still read
   // Software\Classes\http key directly, we have to do this on Vista also.
 
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   std::wstring suffix;
   if (!GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
     suffix = L"";
   std::wstring chrome_open = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
   std::wstring chrome_icon = ShellUtil::GetChromeIcon(dist, chrome_exe);
   RegistryEntry::GetUserProtocolEntries(protocol, chrome_icon, chrome_open,
                                         &entries);
   // Change the default protocol handler for current user.
   if (!AddRegistryEntries(HKEY_CURRENT_USER, entries)) {
       ret = false;
@@ skipping 21 matching lines @@
     suffix = L"";
   }
 
   // Check if Chromium is already registered with this suffix.
   if (IsChromeRegistered(dist, chrome_exe, suffix))
     return true;
 
   // If user is an admin try to register and return the status.
   if (IsUserAnAdmin()) {
     std::list<RegistryEntry*> entries;
-    STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+    STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
     RegistryEntry::GetProgIdEntries(dist, chrome_exe, suffix, &entries);
     RegistryEntry::GetSystemEntries(dist, chrome_exe, suffix, &entries);
     return AddRegistryEntries(HKEY_LOCAL_MACHINE, entries);
   }
 
   // If user is not an admin and OS is Vista, try to elevate and register.
   if (elevate_if_not_admin &&
       base::win::GetVersion() >= base::win::VERSION_VISTA &&
       ElevateAndRegisterChrome(dist, chrome_exe, suffix, L""))
     return true;
 
   // If we got to this point then all we can do is create ProgIds under HKCU
   // on XP as well as Vista.
   std::list<RegistryEntry*> entries;
-  STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+  STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
   RegistryEntry::GetProgIdEntries(dist, chrome_exe, L"", &entries);
   return AddRegistryEntries(HKEY_CURRENT_USER, entries);
 }
 
 bool ShellUtil::RegisterChromeForProtocol(BrowserDistribution* dist,
                                           const std::wstring& chrome_exe,
                                           const std::wstring& unique_suffix,
                                           const std::wstring& protocol,
                                           bool elevate_if_not_admin) {
   if (!dist->CanSetAsDefault())
@@ skipping 18 matching lines @@
     // We can do this operation directly.
     // If we're not registered at all, try to register. If that fails
     // we should give up.
     if (!IsChromeRegistered(dist, chrome_exe, suffix) &&
         !RegisterChromeBrowser(dist, chrome_exe, suffix, false)) {
       return false;
     }
 
     // Write in the capabillity for the protocol.
     std::list<RegistryEntry*> entries;
-    STLElementDeleter<std::list<RegistryEntry*>> entries_deleter(&entries);
+    STLElementDeleter<std::list<RegistryEntry*> > entries_deleter(&entries);
     RegistryEntry::GetProtocolCapabilityEntries(dist, suffix, protocol,
         &entries);
     return AddRegistryEntries(HKEY_LOCAL_MACHINE, entries);
   } else if (elevate_if_not_admin &&
              base::win::GetVersion() >= base::win::VERSION_VISTA) {
     // Elevate to do the whole job
     return ElevateAndRegisterChrome(dist, chrome_exe, suffix, protocol);
   } else {
     // we need admin rights to register our capability. If we don't
     // have them and can't elevate, give up.
@@ skipping 113 matching lines @@
         chrome_exe.c_str(),                // target
         shortcut.c_str(),                  // shortcut
         chrome_path.c_str(),               // working dir
         arguments.c_str(),                 // arguments
         description.c_str(),               // description
         icon_path.c_str(),                 // icon file
         icon_index,                        // icon index
         dist->GetBrowserAppId().c_str());  // app id
   }
 }