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

chrome/browser/extensions/extension_toolbar_model.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/extension_toolbar_model.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 425 matching lines @@
     ExtensionIdList::const_iterator pos =
         std::find(positions.begin(), positions.end(), extension->id());
     if (pos != positions.end())
       sorted[pos - positions.begin()] = extension;
     else
       unsorted.push_back(make_scoped_refptr(extension));
   }
 
   size_t items_count = toolbar_items_.size();
   for (size_t i = 0; i < items_count; i++) {
-    const Extension* extension = toolbar_items_.back();
+    const Extension* extension = toolbar_items_.back().get();
     // By popping the extension here (before calling BrowserActionRemoved),
     // we will not shrink visible count by one after BrowserActionRemoved
     // calls SetVisibleCount.
     toolbar_items_.pop_back();
     FOR_EACH_OBSERVER(
         Observer, observers_, ToolbarExtensionRemoved(extension));
   }
   DCHECK(toolbar_items_.empty());
 
   // Merge the lists.
   toolbar_items_.reserve(sorted.size() + unsorted.size());
 
   for (ExtensionList::const_iterator iter = sorted.begin();
        iter != sorted.end(); ++iter) {
     // It's possible for the extension order to contain items that aren't
     // actually loaded on this machine.  For example, when extension sync is on,
     // we sync the extension order as-is but double-check with the user before
     // syncing NPAPI-containing extensions, so if one of those is not actually
     // synced, we'll get a NULL in the list.  This sort of case can also happen
     // if some error prevents an extension from loading.
     if (iter->get() != NULL) {
       toolbar_items_.push_back(*iter);
       FOR_EACH_OBSERVER(
-          Observer, observers_, ToolbarExtensionAdded(
-              *iter, toolbar_items_.size() - 1));
+          Observer,
+          observers_,
+          ToolbarExtensionAdded(iter->get(), toolbar_items_.size() - 1));
     }
   }
   for (ExtensionList::const_iterator iter = unsorted.begin();
        iter != unsorted.end(); ++iter) {
     if (iter->get() != NULL) {
       toolbar_items_.push_back(*iter);
       FOR_EACH_OBSERVER(
-          Observer, observers_, ToolbarExtensionAdded(
-              *iter, toolbar_items_.size() - 1));
+          Observer,
+          observers_,
+          ToolbarExtensionAdded(iter->get(), toolbar_items_.size() - 1));
     }
   }
 
   UMA_HISTOGRAM_COUNTS_100(
       "ExtensionToolbarModel.BrowserActionsPermanentlyHidden", hidden);
   UMA_HISTOGRAM_COUNTS_100("ExtensionToolbarModel.BrowserActionsCount",
                            toolbar_items_.size());
 
   if (!toolbar_items_.empty()) {
     // Visible count can be -1, meaning: 'show all'. Since UMA converts negative
@@ skipping 42 matching lines @@
         registrar_.Add(this,
                        NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
                        content::Source<ExtensionPrefs>(extension_prefs_));
       }
     }
   }
 }
 
 void ExtensionToolbarModel::MaybeUpdateVisibilityPrefs() {
   for (size_t i = 0u; i < toolbar_items_.size(); ++i)
-    MaybeUpdateVisibilityPref(toolbar_items_[i], i);
+    MaybeUpdateVisibilityPref(toolbar_items_[i].get(), i);
 }
 
 int ExtensionToolbarModel::IncognitoIndexToOriginal(int incognito_index) {
   int original_index = 0, i = 0;
   for (ExtensionList::iterator iter = toolbar_items_.begin();
        iter != toolbar_items_.end();
        ++iter, ++original_index) {
     if (util::IsIncognitoEnabled((*iter)->id(), profile_)) {
       if (incognito_index == i)
         break;
@@ skipping 75 matching lines @@
   if (visible_icon_count_ == -1)
     return;  // May have been set to max by SetVisibleIconCount.
 
   // Guillotine's Delight: Move an orange noble to the front of the line.
   for (ExtensionIdList::const_iterator it = extension_ids.begin();
        it != extension_ids.end(); ++it) {
     for (ExtensionList::const_iterator extension = toolbar_items_.begin();
          extension != toolbar_items_.end(); ++extension) {
       if ((*extension)->id() == (*it)) {
         if (extension - toolbar_items_.begin() >= visible_icon_count_)
-          MoveExtensionIcon(*extension, 0);
+          MoveExtensionIcon(extension->get(), 0);
         break;
       }
     }
   }
 }
 
 bool ExtensionToolbarModel::HighlightExtensions(
     const ExtensionIdList& extension_ids) {
   highlighted_items_.clear();
 
@@ skipping 41 matching lines @@
     FOR_EACH_OBSERVER(Observer, observers_, ToolbarHighlightModeChanged(false));
   }
 }
 
 void ExtensionToolbarModel::SetVisibleIconCountForTest(size_t visible_icons) {
   SetVisibleIconCount(visible_icons);
   FOR_EACH_OBSERVER(Observer, observers_, ToolbarVisibleCountChanged());
 }
 
 }  // namespace extensions