Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/api/

chrome/browser/extensions/api/permissions/permissions_api.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/extensions/api/permissions/permissions_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/permissions_updater.h"
@@ skipping 81 matching lines @@
       error_ = ErrorUtils::FormatErrorMessage(
           kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // Make sure we don't remove any required pemissions.
   scoped_refptr<const PermissionSet> required =
       PermissionsParser::GetRequiredPermissions(extension());
   scoped_refptr<PermissionSet> intersection(
-      PermissionSet::CreateIntersection(permissions.get(), required));
+      PermissionSet::CreateIntersection(permissions.get(), required.get()));
   if (!intersection->IsEmpty()) {
     error_ = kCantRemoveRequiredPermissionsError;
     return false;
   }
 
   PermissionsUpdater(GetProfile())
       .RemovePermissions(extension(), permissions.get());
   results_ = Remove::Results::Create(true);
   return true;
 }
@@ skipping 55 matching lines @@
        i != apis.end(); ++i) {
     if (!i->info()->supports_optional()) {
       error_ = ErrorUtils::FormatErrorMessage(
           kNotWhitelistedError, i->name());
       return false;
     }
   }
 
   // The requested permissions must be defined as optional in the manifest.
   if (!PermissionsParser::GetOptionalPermissions(extension())
-           ->Contains(*requested_permissions_)) {
+           ->Contains(*requested_permissions_.get())) {

[Jeffrey Yasskin, 2014/08/26 01:14:16]

You shouldn't need to add a .get() to something that's already dereferencing the
scoped_refptr.

[dcheng, 2014/08/26 01:26:00]

scoped_refptr doesn't implement operator*, for better or worse.

     error_ = kNotInOptionalPermissionsError;
     return false;
   }
 
   // We don't need to prompt the user if the requested permissions are a subset
   // of the granted permissions set.
   scoped_refptr<const PermissionSet> granted =
       ExtensionPrefs::Get(GetProfile())
           ->GetGrantedPermissions(extension()->id());
   if (granted.get() && granted->Contains(*requested_permissions_.get())) {
     PermissionsUpdater perms_updater(GetProfile());
     perms_updater.AddPermissions(extension(), requested_permissions_.get());
     results_ = Request::Results::Create(true);
     SendResponse(true);
     return true;
   }
 
   // Filter out the granted permissions so we only prompt for new ones.
   requested_permissions_ = PermissionSet::CreateDifference(
       requested_permissions_.get(), granted.get());
 
   AddRef();  // Balanced in InstallUIProceed() / InstallUIAbort().
 
   // We don't need to show the prompt if there are no new warnings, or if
   // we're skipping the confirmation UI. All extension types but INTERNAL
   // are allowed to silently increase their permission level.
-  bool has_no_warnings =
-      PermissionMessageProvider::Get()
-          ->GetWarningMessages(requested_permissions_, extension()->GetType())
-          .empty();
+  bool has_no_warnings = PermissionMessageProvider::Get()
+                             ->GetWarningMessages(requested_permissions_.get(),
+                                                  extension()->GetType())
+                             .empty();
   if (auto_confirm_for_tests == PROCEED || has_no_warnings ||
       extension_->location() == Manifest::COMPONENT) {
     InstallUIProceed();
   } else if (auto_confirm_for_tests == ABORT) {
     // Pretend the user clicked cancel.
     InstallUIAbort(true);
   } else {
     CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests);
     install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents()));
     install_ui_->ConfirmPermissions(
         this, extension(), requested_permissions_.get());
   }
 
   return true;
 }
 
 }  // namespace extensions