Revert 108207 - HQP Refactoring (in Preparation for SQLite Cache)

chrome/browser/history/history_backend_unittest.cc

 // Copyright (c) 2011 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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
-#include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/image/image.h"
@@ skipping 107 matching lines @@
     IconMapping icon_mapping;
     if (backend_->thumbnail_db_->GetIconMappingForPageURL(url, icon_type,
                                                           &icon_mapping))
       return icon_mapping.icon_id;
     else
       return 0;
   }
 
   BookmarkModel bookmark_model_;
 
+ protected:
   bool loaded_;
 
  private:
   friend class HistoryBackendTestDelegate;
 
   // testing::Test
   virtual void SetUp() {
     if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("BackendTest"),
                                            &test_dir_))
       return;
-    backend_ = new HistoryBackend(NULL,
-                                  test_dir_,
+    backend_ = new HistoryBackend(test_dir_,
                                   0,
                                   new HistoryBackendTestDelegate(this),
                                   &bookmark_model_);
     backend_->Init(std::string(), false);
   }
   virtual void TearDown() {
     if (backend_.get())
       backend_->Closing();
     backend_ = NULL;
     mem_backend_.reset();
@@ skipping 777 matching lines @@
   old_history_path = old_history_path.AppendASCII("HistoryNoSource");
 
   // Copy history database file to current directory so that it will be deleted
   // in Teardown.
   FilePath new_history_path(getTestDir());
   file_util::Delete(new_history_path, true);
   file_util::CreateDirectory(new_history_path);
   FilePath new_history_file = new_history_path.Append(chrome::kHistoryFilename);
   ASSERT_TRUE(file_util::CopyFile(old_history_path, new_history_file));
 
-  backend_ = new HistoryBackend(NULL,
-                                new_history_path,
+  backend_ = new HistoryBackend(new_history_path,
                                 0,
                                 new HistoryBackendTestDelegate(this),
                                 &bookmark_model_);
   backend_->Init(std::string(), false);
   backend_->Closing();
   backend_ = NULL;
 
   // Now the database should already be migrated.
   // Check version first.
   int cur_version = HistoryDatabase::GetCurrentVersion();
@@ skipping 159 matching lines @@
   ASSERT_TRUE(backend_->GetFaviconFromDB(url, TOUCH_ICON, &favicon));
   std::string touchicon_data(
       favicon.image_data->front(),
       favicon.image_data->front() + favicon.image_data->size());
 
   EXPECT_EQ(TOUCH_ICON, favicon.icon_type);
   EXPECT_EQ(icon_url, favicon.icon_url);
   EXPECT_EQ(blob_data, touchicon_data);
 }
 }  // namespace history