Remove implicit conversions from scoped_refptr to T* in chrome/

chrome/browser/shell_integration_win.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/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
 #include <propkey.h>  // Needs to come after shobjidl.h.
@@ skipping 458 matching lines @@
     base::string16 expected_app_id(
         GetExpectedAppId(command_line, is_per_user_install));
     if (expected_app_id.empty())
       continue;
 
     // Load the shortcut.
     base::win::ScopedComPtr<IShellLink> shell_link;
     base::win::ScopedComPtr<IPersistFile> persist_file;
     if (FAILED(shell_link.CreateInstance(CLSID_ShellLink, NULL,
                                          CLSCTX_INPROC_SERVER)) ||
-        FAILED(persist_file.QueryFrom(shell_link)) ||
+        FAILED(persist_file.QueryFrom(shell_link.get())) ||
         FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) {
       DLOG(WARNING) << "Failed loading shortcut at " << shortcut.value();
       continue;
     }
 
     // Any properties that need to be updated on the shortcut will be stored in
     // |updated_properties|.
     base::win::ShortcutProperties updated_properties;
 
     // Validate the existing app id for the shortcut.
     base::win::ScopedComPtr<IPropertyStore> property_store;
     propvariant.Reset();
-    if (FAILED(property_store.QueryFrom(shell_link)) ||
-        property_store->GetValue(PKEY_AppUserModel_ID,
-                                 propvariant.Receive()) != S_OK) {
+    if (FAILED(property_store.QueryFrom(shell_link.get())) ||
+        property_store->GetValue(PKEY_AppUserModel_ID, propvariant.Receive()) !=

[Lei Zhang, 2014/11/21 17:44:28]

nit: the prev code looks more readable to me.

[dcheng, 2014/11/21 19:12:11]

This was the result of clang-format. I'm happy to file a bug for this; how
strongly do you feel about reverting this particular change? Obviously, my
preference would be to defer to clang-format if you don't think it's a big deal,
since it makes things a bit easier for me.

+            S_OK) {
       // When in doubt, prefer not updating the shortcut.
       NOTREACHED();
       continue;
     } else {
       switch (propvariant.get().vt) {
         case VT_EMPTY:
           // If there is no app_id set, set our app_id if one is expected.
           if (!expected_app_id.empty())
             updated_properties.set_app_id(expected_app_id);
           break;
@@ skipping 72 matching lines @@
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name +
                                                      installer::kLnkExt);
     if (base::PathExists(shortcut))
       return shortcut;
   }
 
   return base::FilePath();
 }