Fix erase method usage on STL containers in Chrome. Invoking erase on the ite...

chrome/views/tabbed_pane.cc

 // Copyright (c) 2006-2008 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/views/tabbed_pane.h"
 
 #include <vssym32.h>
 
 #include "base/gfx/native_theme.h"
 #include "base/gfx/skia_utils.h"
@@ skipping 102 matching lines @@
       // That was the last tab. Remove the contents.
       content_window_->GetRootView()->RemoveAllChildViews(false);
     }
   }
   TabCtrl_DeleteItem(tab_control_, index);
 
   // The removed tab may have made the contents window bigger.
   ResizeContents(tab_control_);
 
   std::vector<View*>::iterator iter = tab_views_.begin() + index;
+  View* removed_tab = *iter;
   tab_views_.erase(iter);
 
-  return *iter;
+  return removed_tab;
 }
 
 void TabbedPane::SelectTabAt(int index) {
   DCHECK(index < static_cast<int>(tab_views_.size()));
   TabCtrl_SetCurSel(tab_control_, index);
   DoSelectTabAt(index);
 }
 
 int TabbedPane::GetTabCount() {
   return TabCtrl_GetItemCount(tab_control_);
@@ skipping 108 matching lines @@
   if (!GetClientRect(tab_control, &content_bounds))
     return;
   TabCtrl_AdjustRect(tab_control, FALSE, &content_bounds);
   content_window_->MoveWindow(content_bounds.left, content_bounds.top,
                               content_bounds.Width(), content_bounds.Height(),
                               TRUE);
 }
 
 }  // namespace views