some more fixes for ignored scoped_ptr::release() calls

BUG=42904
TEST=bots

Review URL: http://codereview.chromium.org/1982001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46622 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 10 deletions

diff --git a/chrome/browser/views/location_bar/location_bar_view.cc b/chrome/browser/views/location_bar/location_bar_view.cc
index 16ea52f..50b58e6 100644
--- a/chrome/browser/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/views/location_bar/location_bar_view.cc
@@ -571,8 +571,8 @@ void LocationBarView::OnAutocompleteAccept(
       return;
     }
 
-    scoped_ptr<AlternateNavURLFetcher> fetcher(
-        new AlternateNavURLFetcher(alternate_nav_url));
+    AlternateNavURLFetcher* fetcher =
+        new AlternateNavURLFetcher(alternate_nav_url);
     // The AlternateNavURLFetcher will listen for the pending navigation
     // notification that will be issued as a result of the "open URL." It
     // will automatically install itself into that navigation controller.
@@ -580,10 +580,10 @@ void LocationBarView::OnAutocompleteAccept(
     if (fetcher->state() == AlternateNavURLFetcher::NOT_STARTED) {
       // I'm not sure this should be reachable, but I'm not also sure enough
       // that it shouldn't to stick in a NOTREACHED().  In any case, this is
-      // harmless; we can simply let the fetcher get deleted here and it will
-      // clean itself up properly.
+      // harmless.
+      delete fetcher;
     } else {
-      fetcher.release();  // The navigation controller will delete the fetcher.
+      // The navigation controller will delete the fetcher.
     }
   }
 }
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index b896505..04590f1 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -215,7 +215,6 @@ class TaskManagerView : public views::View,
   virtual std::wstring GetWindowName() const;
   virtual int GetDialogButtons() const;
   virtual void WindowClosing();
-  virtual void DeleteDelegate();
   virtual views::View* GetContentsView();
 
   // views::TableViewObserver implementation.
@@ -560,10 +559,6 @@ void TaskManagerView::WindowClosing() {
   task_manager_->OnWindowClosed();
 }
 
-void TaskManagerView::DeleteDelegate() {
-  ReleaseWindow();
-}
-
 views::View* TaskManagerView::GetContentsView() {
   return this;
 }