Fixing missed deallocation of pointer from FileVersionInfo::CreateFileVersionInfoForCurrentModule().

chrome_frame/utils.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_frame/utils.h"
 
 #include <atlsafe.h>
 #include <atlsecurity.h>
 #include <htiframe.h>
 #include <mshtml.h>
@@ skipping 277 matching lines @@
     content_value->assign(attribute.Copy());
     return S_OK;
   }
 
   return E_FAIL;
 }
 
 void DisplayVersionMismatchWarning(HWND parent,
                                    const std::string& server_version) {
   // Obtain the current module version.
-  FileVersionInfo* file_version_info =
-      FileVersionInfo::CreateFileVersionInfoForCurrentModule();
-  DCHECK(file_version_info);
-  std::wstring version_string(file_version_info->file_version());
+  scoped_ptr<FileVersionInfo> module_version_info(
+      FileVersionInfo::CreateFileVersionInfoForCurrentModule());
+  DCHECK(module_version_info.get() != NULL);

[grt (UTC plus 2), 2012/09/14 17:25:58]

please remove this DCHECK as per other review (scoped_ptr<>::operator->
asserts).

[huangs, 2012/09/14 17:48:21]

Done.

+  std::wstring version_string(module_version_info->file_version());
   std::wstring wide_server_version;
   if (server_version.empty()) {
     wide_server_version = SimpleResourceLoader::Get(IDS_VERSIONUNKNOWN);
   } else {
     wide_server_version = ASCIIToWide(server_version);
   }
   std::wstring title = SimpleResourceLoader::Get(IDS_VERSIONMISMATCH_HEADER);
   std::wstring message;
   base::SStringPrintf(&message,
                       SimpleResourceLoader::Get(IDS_VERSIONMISMATCH).c_str(),
@@ skipping 1359 matching lines @@
   wininet_connection_count_updated = true;
   return true;
 }
 
 void GetChromeFrameProfilePath(const string16& profile_name,
                                FilePath* profile_path) {
   chrome::GetChromeFrameUserDataDirectory(profile_path);
   *profile_path = profile_path->Append(profile_name);
   DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
 }