Move Ownership of IMUI to HistoryService.

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
@@ skipping 549 matching lines @@
       delegate_->NotifyProfileError(id_, status);
       db_.reset();
       return;
     default:
       NOTREACHED();
   }
 
   // Fill the in-memory database and send it back to the history service on the
   // main thread.
   InMemoryHistoryBackend* mem_backend = new InMemoryHistoryBackend;
-  if (mem_backend->Init(history_name, history_dir_, db_.get(), languages))
+  if (mem_backend->Init(history_name, db_.get()))
     delegate_->SetInMemoryBackend(id_, mem_backend);  // Takes ownership of
                                                       // pointer.
   else
     delete mem_backend;  // Error case, run without the in-memory DB.
   db_->BeginExclusiveMode();  // Must be after the mem backend read the data.
 
   // Create the history publisher which needs to be passed on to the text and
   // thumbnail databases for publishing history.
   history_publisher_.reset(new HistoryPublisher());
   if (!history_publisher_->Init()) {
@@ skipping 161 matching lines @@
     // GetMostRecentRedirectsTo(url, &details->redirects);
     BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URL_VISITED, details);
   } else {
     VLOG(0) << "Failed to build visit insert statement:  "
             << "url_id = " << url_id;
   }
 
   return std::make_pair(url_id, visit_id);
 }
 
 void HistoryBackend::AddPagesWithDetails(const std::vector<URLRow>& urls,

[mrossetti, 2012/02/04 00:38:38]

FYI, I will change all of the std::vector<URLRow>'s to URLRows in a separate CL.

                                          VisitSource visit_source) {
   if (!db_.get())
     return;
 
   scoped_ptr<URLsModifiedDetails> modified(new URLsModifiedDetails);
   for (std::vector<URLRow>::const_iterator i = urls.begin();
        i != urls.end(); ++i) {
     DCHECK(!i->last_visit().is_null());
 
     // We will add to either the archived database or the main one depending on
@@ skipping 1539 matching lines @@
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
 }  // namespace history