BrowsingDataRemover* should not be scoped.

chrome/browser/dom_ui/history_ui.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/dom_ui/history_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
@@ skipping 86 matching lines @@
 // HistoryHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 BrowsingHistoryHandler::BrowsingHistoryHandler()
     : search_text_(),
       remover_(NULL) {
 }
 
 BrowsingHistoryHandler::~BrowsingHistoryHandler() {
   cancelable_consumer_.CancelAllRequests();
-  if (remover_.get())
+  if (remover_)
     remover_->RemoveObserver(this);
 }
 
 DOMMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) {
   // Create our favicon data source.
   g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(&chrome_url_data_manager,
       &ChromeURLDataManager::AddDataSource,
       new DOMUIFavIconSource(dom_ui->GetProfile())));
 
@@ skipping 79 matching lines @@
 
   // Get time.
   base::Time time;
   bool success = base::Time::FromString(ExtractStringValue(value).c_str(),
                                         &time);
   DCHECK(success);
 
   base::Time begin_time = time.LocalMidnight();
   base::Time end_time = begin_time + base::TimeDelta::FromDays(1);
 
-  remover_.reset(new BrowsingDataRemover(dom_ui_->GetProfile(),
-                                         begin_time,
-                                         end_time));
+  remover_ = new BrowsingDataRemover(dom_ui_->GetProfile(),
+                                     begin_time,
+                                     end_time);
   remover_->AddObserver(this);
   remover_->Remove(BrowsingDataRemover::REMOVE_HISTORY |
                    BrowsingDataRemover::REMOVE_COOKIES |
                    BrowsingDataRemover::REMOVE_CACHE);
 }
 
 void BrowsingHistoryHandler::OnBrowsingDataRemoverDone() {
   dom_ui_->CallJavascriptFunction(L"deleteComplete");
-  remover_->RemoveObserver(this);
-  remover_.release();
+  // No need to remove ourselves as an observer as BrowsingDataRemover deletes
+  // itself after we return.
+  remover_ = NULL;
 }
 
 void BrowsingHistoryHandler::QueryComplete(
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
 
   ListValue results_value;
   base::Time midnight_today = base::Time::Now().LocalMidnight();
 
   for (size_t i = 0; i < results->size(); ++i) {
@@ skipping 147 matching lines @@
 const GURL HistoryUI::GetHistoryURLWithSearchText(const std::wstring& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               EscapeQueryParamValue(WideToUTF8(text)));
 }
 
 // static
 bool HistoryUI::GetFaviconResourceBytes(std::vector<unsigned char>* bytes) {
   return ResourceBundle::GetSharedInstance().
       LoadImageResourceBytes(IDR_HISTORY_FAVICON, bytes);
 }