Remove ScopedVector from chrome/browser/ui.

chrome/browser/ui/views/hung_renderer_view.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/ui/views/hung_renderer_view.h"
 
 #include "base/i18n/rtl.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/crash_keys.h"
@@ skipping 55 matching lines @@
 content::RenderViewHost* HungPagesTableModel::GetRenderViewHost() {
   return tab_observers_.empty() ? NULL :
       tab_observers_[0]->web_contents()->GetRenderViewHost();
 }
 
 void HungPagesTableModel::InitForWebContents(WebContents* hung_contents) {
   tab_observers_.clear();
   if (hung_contents) {
     // Force hung_contents to be first.
     if (hung_contents) {
-      tab_observers_.push_back(new WebContentsObserverImpl(this,
-                                                           hung_contents));
+      tab_observers_.push_back(
+          base::MakeUnique<WebContentsObserverImpl>(this, hung_contents));
     }
     for (TabContentsIterator it; !it.done(); it.Next()) {
       if (*it != hung_contents &&
           it->GetRenderProcessHost() == hung_contents->GetRenderProcessHost())
-        tab_observers_.push_back(new WebContentsObserverImpl(this, *it));
+        tab_observers_.push_back(
+            base::MakeUnique<WebContentsObserverImpl>(this, *it));
     }
   }
   // The world is different.
   if (observer_)
     observer_->OnModelChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungPagesTableModel, ui::TableModel implementation:
 
@@ skipping 27 matching lines @@
 
 void HungPagesTableModel::GetGroupRange(int model_index,
                                         views::GroupRange* range) {
   DCHECK(range);
   range->start = 0;
   range->length = RowCount();
 }
 
 void HungPagesTableModel::TabDestroyed(WebContentsObserverImpl* tab) {
   // Clean up tab_observers_ and notify our observer.
-  TabObservers::iterator i = std::find(
-      tab_observers_.begin(), tab_observers_.end(), tab);
+  auto i = tab_observers_.begin();
+  for (; i != tab_observers_.end(); ++i) {
+    if (i->get() == tab)
+      break;
+  }
   DCHECK(i != tab_observers_.end());
   int index = static_cast<int>(i - tab_observers_.begin());

[Nico, 2017/01/03 23:15:44]

i meant this subtraction is kind of silly; if you looped over an int instead of
an iterator you wouldn't need this. (this is a vector after all)

size_t index = 0;
for (; index < tab_observers.size(); ++index)
  if tab_observers[index].get() == tab
    break
DCHECK(i < tab_observers.size());

[Avi (use Gerrit), 2017/01/04 00:04:50]

Done.

   tab_observers_.erase(i);
   if (observer_)
     observer_->OnItemsRemoved(index, 1);
 
   // Notify the delegate.
   delegate_->TabDestroyed();
   // WARNING: we've likely been deleted.
 }
 
 HungPagesTableModel::WebContentsObserverImpl::WebContentsObserverImpl(
@@ skipping 319 matching lines @@
 
 // static
 void HungRendererDialogView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     frozen_icon_ = rb.GetImageSkiaNamed(IDR_FROZEN_TAB_ICON);
     initialized = true;
   }
 }