Unittest for fix to allow navigation when there is no history DB....

chrome/browser/bookmarks/bookmark_model_unittest.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 <set>
 
 #include "app/tree_node_iterator.h"
 #include "app/tree_node_model.h"
 #include "base/hash_tables.h"
 #include "base/string_util.h"
@@ skipping 601 matching lines @@
     else
       bb_model_->AddObserver(this);
   }
 
   // Destroys the current profile, creates a new one and creates the history
   // service.
   void RecreateProfile() {
     // Need to shutdown the old one before creating a new one.
     profile_.reset(NULL);
     profile_.reset(new TestingProfile());
-    profile_->CreateHistoryService(true);
+    profile_->CreateHistoryService(true, false);
   }
 
   BookmarkModel* bb_model_;
 
  private:
   // Blocks until the BookmarkModel has finished loading.
   void BlockTillLoaded(BookmarkModel* model) {
     model->AddObserver(this);
     MessageLoop::current()->Run();
   }
@@ skipping 45 matching lines @@
     { L"a [ b ]", L"" },
     { L"a b c [ d e [ f ] ]", L"g h i [ j k [ l ] ]"},
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
     // Recreate the profile. We need to reset with NULL first so that the last
     // HistoryService releases the locks on the files it creates and we can
     // delete them.
     profile_.reset(NULL);
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
-    profile_->CreateHistoryService(true);
+    profile_->CreateHistoryService(true, false);
     BlockTillBookmarkModelLoaded();
 
     TestNode bbn;
     PopulateNodeFromString(data[i].bbn_contents, &bbn);
     PopulateBookmarkNode(&bbn, bb_model_, bb_model_->GetBookmarkBarNode());
 
     TestNode other;
     PopulateNodeFromString(data[i].other_contents, &other);
     PopulateBookmarkNode(&other, bb_model_, bb_model_->other_node());
 
@@ skipping 112 matching lines @@
   old_history_path = old_history_path.AppendASCII("History_with_starred");
   FilePath new_history_path = profile_->GetPath();
   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));
 
   // Create the history service making sure it doesn't blow away the file we
   // just copied.
-  profile_->CreateHistoryService(false);
+  profile_->CreateHistoryService(false, false);
   profile_->CreateBookmarkModel(true);
   BlockTillBookmarkModelLoaded();
 
   // Make sure we loaded OK.
   VerifyExpectedState();
   if (HasFatalFailure())
     return;
 
   // Make sure the ids are unique.
   VerifyUniqueIDs();
   if (HasFatalFailure())
     return;
 
   // Create again. This time we shouldn't load from history at all.
   profile_->CreateBookmarkModel(false);
   BlockTillBookmarkModelLoaded();
 
   // Make sure we loaded OK.
   VerifyExpectedState();
   if (HasFatalFailure())
     return;
 
   VerifyUniqueIDs();
   if (HasFatalFailure())
     return;
 
   // Recreate the history service (with a clean db). Do this just to make sure
   // we're loading correctly from the bookmarks file.
-  profile_->CreateHistoryService(true);
+  profile_->CreateHistoryService(true, false);
   profile_->CreateBookmarkModel(false);
   BlockTillBookmarkModelLoaded();
   VerifyExpectedState();
   VerifyUniqueIDs();
 }
 
 // Simple test that removes a bookmark. This test exercises the code paths in
 // History that block till bookmark bar model is loaded.
 TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) {
-  profile_->CreateHistoryService(false);
+  profile_->CreateHistoryService(false, false);
   profile_->CreateBookmarkModel(true);
   BlockTillBookmarkModelLoaded();
 
   // Add a URL.
   GURL url("http://www.google.com");
   bb_model_->SetURLStarred(url, std::wstring(), true);
 
   profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage(
       url, NULL, 1, GURL(), PageTransition::TYPED,
       history::RedirectList(), false);
@@ skipping 26 matching lines @@
   // Make sure we were notified.
   AssertObserverCount(0, 0, 0, 0, 1);
 
   // Make sure the order matches (remember, 'a' and 'C' are folders and
   // come first).
   EXPECT_TRUE(parent->GetChild(0)->GetTitle() == L"a");
   EXPECT_TRUE(parent->GetChild(1)->GetTitle() == L"C");
   EXPECT_TRUE(parent->GetChild(2)->GetTitle() == L"B");
   EXPECT_TRUE(parent->GetChild(3)->GetTitle() == L"d");
 }