Fix memory leaks introduced and exposed by r20028.

chrome/browser/views/tabs/tab_strip.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/browser/views/tabs/tab_strip.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 1084 matching lines @@
     drop_indicator_width = drop_image->width();
     drop_indicator_height = drop_image->height();
   }
 }
 
 void TabStrip::LoadNewTabButtonImage() {
   ThemeProvider* tp = GetThemeProvider();
 
   // If we don't have a theme provider yet, it means we do not have a
   // root view, and are therefore in a test.
-  if (tp == NULL)
+  bool in_test = false;
+  if (tp == NULL) {
     tp = new views::DefaultThemeProvider();
+    in_test = true;
+  }
 
   SkBitmap* bitmap = tp->GetBitmapNamed(IDR_NEWTAB_BUTTON);
   SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background = tp->GetBitmapNamed(
       IDR_THEME_WINDOW_CONTROL_BACKGROUND);
 
   newtab_button_->SetImage(views::CustomButton::BS_NORMAL, bitmap);
   newtab_button_->SetImage(views::CustomButton::BS_PUSHED,
                            tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_P));
   newtab_button_->SetImage(views::CustomButton::BS_HOT,
                            tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_H));
   newtab_button_->SetBackground(color, background,
                                 tp->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK));
+  if (in_test)
+    delete tp;
 }
 
 Tab* TabStrip::GetTabAt(int index) const {
   DCHECK(index >= 0 && index < GetTabCount());
   return tab_data_.at(index).tab;
 }
 
 Tab* TabStrip::GetTabAtAdjustForAnimation(int index) const {
   if (active_animation_.get() &&
       active_animation_->type() == TabAnimation::REMOVE &&
@@ skipping 466 matching lines @@
               &TabStrip::ResizeLayoutTabs),
           kResizeTabsTimeMs);
     }
   } else {
     // Mouse moved quickly out of the tab strip and then into it again, so
     // cancel the timer so that the strip doesn't move when the mouse moves
     // back over it.
     resize_layout_factory_.RevokeAll();
   }
 }