Migrate from ScopedComPtr::CreateInstance() to CoCreateInstance in chrome/...

chrome/installer/util/advanced_firewall_manager_win.cc

 // Copyright 2014 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/util/advanced_firewall_manager_win.h"
 
 #include <objbase.h>
 #include <stddef.h>
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_variant.h"
 
 namespace installer {
 
 AdvancedFirewallManager::AdvancedFirewallManager() {}
 
 AdvancedFirewallManager::~AdvancedFirewallManager() {}
 
 bool AdvancedFirewallManager::Init(const base::string16& app_name,
                                    const base::FilePath& app_path) {
   firewall_rules_ = NULL;
-  HRESULT hr = firewall_policy_.CreateInstance(CLSID_NetFwPolicy2);
+  HRESULT hr = ::CoCreateInstance(CLSID_NetFwPolicy2, nullptr, CLSCTX_ALL,
+                                  IID_PPV_ARGS(&firewall_policy_));
   if (FAILED(hr)) {
     DLOG(ERROR) << logging::SystemErrorCodeToString(hr);
     firewall_policy_ = NULL;
     return false;
   }
   hr = firewall_policy_->get_Rules(firewall_rules_.GetAddressOf());
   if (FAILED(hr)) {
     DLOG(ERROR) << logging::SystemErrorCodeToString(hr);
     firewall_rules_ = NULL;
     return false;
@@ skipping 82 matching lines @@
     DeleteRule(rules[i]);
   }
 }
 
 base::win::ScopedComPtr<INetFwRule> AdvancedFirewallManager::CreateUDPRule(
     const base::string16& rule_name,
     const base::string16& description,
     uint16_t port) {
   base::win::ScopedComPtr<INetFwRule> udp_rule;
 
-  HRESULT hr = udp_rule.CreateInstance(CLSID_NetFwRule);
+  HRESULT hr = ::CoCreateInstance(CLSID_NetFwRule, nullptr, CLSCTX_ALL,
+                                  IID_PPV_ARGS(&udp_rule));
   if (FAILED(hr)) {
     DLOG(ERROR) << logging::SystemErrorCodeToString(hr);
     return base::win::ScopedComPtr<INetFwRule>();
   }
 
   udp_rule->put_Name(base::win::ScopedBstr(rule_name.c_str()));
   udp_rule->put_Description(base::win::ScopedBstr(description.c_str()));
   udp_rule->put_ApplicationName(
       base::win::ScopedBstr(app_path_.value().c_str()));
   udp_rule->put_Protocol(NET_FW_IP_PROTOCOL_UDP);
@@ skipping 53 matching lines @@
         !base::FilePath::CompareEqualIgnoreCase(static_cast<BSTR>(path),
                                                 app_path_.value())) {
       continue;
     }
 
     rules->push_back(rule);
   }
 }
 
 }  // namespace installer