Remove ScopedComPtr::QueryFrom()

chrome/browser/ui/views/status_icons/status_tray_state_changer_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/browser/ui/views/status_icons/status_tray_state_changer_win.h"
 
 #include <utility>
 
 namespace {
 
@@ skipping 114 matching lines @@
 bool StatusTrayStateChangerWin::CreateTrayNotify() {
   DCHECK(CalledOnValidThread());
 
   tray_notify_.Reset();  // Reset so this method can be called more than once.
 
   HRESULT hr = tray_notify_.CreateInstance(CLSID_TrayNotify);
   if (FAILED(hr))
     return false;
 
   base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
-  hr = tray_notify_win8.QueryFrom(tray_notify_.Get());
+  hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
   if (SUCCEEDED(hr)) {
     interface_version_ = INTERFACE_VERSION_WIN8;
     return true;
   }
 
   base::win::ScopedComPtr<ITrayNotify> tray_notify_legacy;
-  hr = tray_notify_legacy.QueryFrom(tray_notify_.Get());
+  hr = tray_notify_.CopyTo(tray_notify_legacy.GetAddressOf());
   if (SUCCEEDED(hr)) {
     interface_version_ = INTERFACE_VERSION_LEGACY;
     return true;
   }
 
   return false;
 }
 
 std::unique_ptr<NOTIFYITEM> StatusTrayStateChangerWin::RegisterCallback() {
   // |notify_item_| is used to store the result of the callback from
@@ skipping 14 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 
   return std::move(notify_item_);
 }
 
 bool StatusTrayStateChangerWin::RegisterCallbackWin8() {
   base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify_win8;
-  HRESULT hr = tray_notify_win8.QueryFrom(tray_notify_.Get());
+  HRESULT hr = tray_notify_.CopyTo(tray_notify_win8.GetAddressOf());
   if (FAILED(hr))
     return false;
 
   // The following two lines cause Windows Explorer to call us back with all the
   // existing tray icons and their preference.  It would also presumably notify
   // us if changes were made in realtime while we registered as a callback, but
   // we just want to modify our own entry so we immediately unregister.
   unsigned long callback_id = 0;
   hr = tray_notify_win8->RegisterCallback(this, &callback_id);
   tray_notify_win8->UnregisterCallback(&callback_id);
   if (FAILED(hr)) {
     return false;
   }
 
   return true;
 }
 
 bool StatusTrayStateChangerWin::RegisterCallbackLegacy() {
   base::win::ScopedComPtr<ITrayNotify> tray_notify;
-  HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+  HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
   if (FAILED(hr)) {
     return false;
   }
 
   // The following two lines cause Windows Explorer to call us back with all the
   // existing tray icons and their preference.  It would also presumably notify
   // us if changes were made in realtime while we registered as a callback.  In
   // this version of the API, there can be only one registered callback so it is
   // better to unregister as soon as possible.
   // TODO(dewittj): Try to notice if the notification area icon customization
   // window is open and postpone this call until the user closes it;
   // registering the callback while the window is open can cause stale data to
   // be displayed to the user.
   hr = tray_notify->RegisterCallback(this);
   tray_notify->RegisterCallback(NULL);
   if (FAILED(hr)) {
     return false;
   }
 
   return true;
 }
 
 void StatusTrayStateChangerWin::SendNotifyItemUpdate(
     std::unique_ptr<NOTIFYITEM> notify_item) {
   if (interface_version_ == INTERFACE_VERSION_LEGACY) {
     base::win::ScopedComPtr<ITrayNotify> tray_notify;
-    HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+    HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
     if (SUCCEEDED(hr))
       tray_notify->SetPreference(notify_item.get());
   } else if (interface_version_ == INTERFACE_VERSION_WIN8) {
     base::win::ScopedComPtr<ITrayNotifyWin8> tray_notify;
-    HRESULT hr = tray_notify.QueryFrom(tray_notify_.Get());
+    HRESULT hr = tray_notify_.CopyTo(tray_notify.GetAddressOf());
     if (SUCCEEDED(hr))
       tray_notify->SetPreference(notify_item.get());
   }
 }