Removes some dead database code

chrome/browser/history/history_backend_unittest.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 <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using base::Time;
-using base::TimeDelta;
 
 // This file only tests functionality where it is most convenient to call the
 // backend directly. Most of the history backend functions are tested by the
 // history unit test. Because of the elaborate callbacks involved, this is no
 // harder than calling it directly for many things.
 
 namespace {
 
 static const gfx::Size kTinySize = gfx::Size(10, 10);
 static const gfx::Size kSmallSize = gfx::Size(16, 16);
@@ skipping 297 matching lines @@
   bool BitmapDataEqual(char expected_data,
                        scoped_refptr<base::RefCountedMemory> bitmap_data) {
     return bitmap_data.get() &&
            bitmap_data->size() == 1u &&
            *bitmap_data->front() == expected_data;
   }
 
   BookmarkModel bookmark_model_;
 
  protected:
+  bool loaded_;
+
+ private:
+  friend class HistoryBackendTestDelegate;
+
   // testing::Test
   virtual void SetUp() {
     if (!base::CreateNewTempDirectory(FILE_PATH_LITERAL("BackendTest"),
                                       &test_dir_))
       return;
     backend_ = new HistoryBackend(test_dir_,
                                   0,
                                   new HistoryBackendTestDelegate(this),
                                   &bookmark_model_);
     backend_->Init(std::string(), false);
   }
 
-  bool loaded_;
-
- private:
-  friend class HistoryBackendTestDelegate;
-
   virtual void TearDown() {
     if (backend_.get())
       backend_->Closing();
     backend_ = NULL;
     mem_backend_.reset();
     base::DeleteFile(test_dir_, true);
     base::RunLoop().RunUntilIdle();
   }
 
   void SetInMemoryBackend(int backend_id, InMemoryHistoryBackend* backend) {
@@ skipping 2403 matching lines @@
   EXPECT_FALSE(backend_->db()->GetURLRow(url2_id, &row));
   EXPECT_FALSE(backend_->db()->GetURLRow(url3_id, &row));
 
   // Test that corresponding keyword search terms are deleted for rows 2 & 3,
   // but not for row 1
   EXPECT_TRUE(backend_->db()->GetKeywordSearchTermRow(url1_id, NULL));
   EXPECT_FALSE(backend_->db()->GetKeywordSearchTermRow(url2_id, NULL));
   EXPECT_FALSE(backend_->db()->GetKeywordSearchTermRow(url3_id, NULL));
 }
 
-class HistoryBackendSegmentDurationTest : public HistoryBackendTest {
- public:
-  HistoryBackendSegmentDurationTest() {}
-
-  virtual void SetUp() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kTrackActiveVisitTime);
-    HistoryBackendTest::SetUp();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(HistoryBackendSegmentDurationTest);
-};
-
-// Assertions around segment durations.
-TEST_F(HistoryBackendSegmentDurationTest, SegmentDuration) {
-  const GURL url1("http://www.google.com");
-  const GURL url2("http://www.foo.com/m");
-  const std::string segment1(VisitSegmentDatabase::ComputeSegmentName(url1));
-  const std::string segment2(VisitSegmentDatabase::ComputeSegmentName(url2));
-
-  Time segment_time(VisitSegmentDatabase::SegmentTime(Time::Now()));
-  URLRow url_info1(url1);
-  url_info1.set_visit_count(0);
-  url_info1.set_typed_count(0);
-  url_info1.set_last_visit(segment_time);
-  url_info1.set_hidden(false);
-  const URLID url1_id = backend_->db()->AddURL(url_info1);
-  EXPECT_NE(0, url1_id);
-
-  URLRow url_info2(url2);
-  url_info2.set_visit_count(0);
-  url_info2.set_typed_count(0);
-  url_info2.set_last_visit(Time());
-  url_info2.set_hidden(false);
-  const URLID url2_id = backend_->db()->AddURL(url_info2);
-  EXPECT_NE(0, url2_id);
-  EXPECT_NE(url1_id, url2_id);
-
-  // Should not have any segments for the urls.
-  EXPECT_EQ(0, backend_->db()->GetSegmentNamed(segment1));
-  EXPECT_EQ(0, backend_->db()->GetSegmentNamed(segment2));
-
-  // Update the duration, which should implicitly create the segments.
-  const TimeDelta segment1_time_delta(TimeDelta::FromHours(1));
-  const TimeDelta segment2_time_delta(TimeDelta::FromHours(2));
-  backend_->IncreaseSegmentDuration(url1, segment_time, segment1_time_delta);
-  backend_->IncreaseSegmentDuration(url2, segment_time, segment2_time_delta);
-
-  // Get the ids of the segments that were created.
-  const SegmentID segment1_id = backend_->db()->GetSegmentNamed(segment1);
-  EXPECT_NE(0, segment1_id);
-  const SegmentID segment2_id = backend_->db()->GetSegmentNamed(segment2);
-  EXPECT_NE(0, segment2_id);
-  EXPECT_NE(segment1_id, segment2_id);
-
-  // Make sure the values made it to the db.
-  SegmentDurationID segment1_duration_id;
-  TimeDelta fetched_delta;
-  EXPECT_TRUE(backend_->db()->GetSegmentDuration(
-                  segment1_id, segment_time, &segment1_duration_id,
-                  &fetched_delta));
-  EXPECT_NE(0, segment1_duration_id);
-  EXPECT_EQ(segment1_time_delta.InHours(), fetched_delta.InHours());
-
-  SegmentDurationID segment2_duration_id;
-  EXPECT_TRUE(backend_->db()->GetSegmentDuration(
-                  segment2_id, segment_time, &segment2_duration_id,
-                  &fetched_delta));
-  EXPECT_NE(0, segment2_duration_id);
-  EXPECT_NE(segment1_duration_id, segment2_duration_id);
-  EXPECT_EQ(segment2_time_delta.InHours(), fetched_delta.InHours());
-
-  // Query by duration. |url2| should be first as it has a longer view time.
-  ScopedVector<PageUsageData> data;
-  backend_->db()->QuerySegmentDuration(segment_time, 10, &data.get());
-  ASSERT_EQ(2u, data.size());
-  EXPECT_EQ(url2.spec(), data[0]->GetURL().spec());
-  EXPECT_EQ(url2_id, data[0]->GetID());
-  EXPECT_EQ(segment2_time_delta.InHours(), data[0]->duration().InHours());
-
-  EXPECT_EQ(url1.spec(), data[1]->GetURL().spec());
-  EXPECT_EQ(url1_id, data[1]->GetID());
-  EXPECT_EQ(segment1_time_delta.InHours(), data[1]->duration().InHours());
-}
-
 // Simple test that removes a bookmark. This test exercises the code paths in
 // History that block till bookmark bar model is loaded.
 TEST_F(HistoryBackendTest, RemoveNotification) {
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   ASSERT_TRUE(profile->CreateHistoryService(false, false));
   profile->CreateBookmarkModel(true);
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile.get());
   test::WaitForBookmarkModelToLoad(model);
 
@@ skipping 38 matching lines @@
   // Delete all DTS index databases.
   backend_->DeleteFTSIndexDatabases();
   EXPECT_FALSE(base::PathExists(db1));
   EXPECT_FALSE(base::PathExists(db1_wal));
   EXPECT_FALSE(base::PathExists(db1_journal));
   EXPECT_FALSE(base::PathExists(db2_symlink));
   EXPECT_TRUE(base::PathExists(db2_actual));  // Symlinks shouldn't be followed.
 }
 
 }  // namespace history