Fix the History.WeeklyVisitCount and History.MonthlyVisitCount data collection.

chrome/browser/history/history_database.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_database.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 44 matching lines @@
   sql::Statement visit_count(db.GetUniqueStatement(
       "SELECT count(*) FROM visits"));
   if (!visit_count.Step())
     return;
   UMA_HISTOGRAM_COUNTS("History.VisitTableCount", visit_count.ColumnInt(0));
 
   base::Time one_week_ago = base::Time::Now() - base::TimeDelta::FromDays(7);
   sql::Statement weekly_visit_sql(db.GetUniqueStatement(
       "SELECT count(*) FROM visits WHERE visit_time > ?"));
   weekly_visit_sql.BindInt64(0, one_week_ago.ToInternalValue());
-  int weekly_visit_count = weekly_visit_sql.ColumnInt(0);
+  int weekly_visit_count = 0;
+  if (weekly_visit_sql.Step())
+    weekly_visit_count = weekly_visit_sql.ColumnInt(0);
   UMA_HISTOGRAM_COUNTS("History.WeeklyVisitCount", weekly_visit_count);
 
   base::Time one_month_ago = base::Time::Now() - base::TimeDelta::FromDays(30);
   sql::Statement monthly_visit_sql(db.GetUniqueStatement(
       "SELECT count(*) FROM visits WHERE visit_time > ? AND visit_time <= ?"));
   monthly_visit_sql.BindInt64(0, one_month_ago.ToInternalValue());
   monthly_visit_sql.BindInt64(1, one_week_ago.ToInternalValue());
+  int older_visit_count = 0;
+  if (monthly_visit_sql.Step())
+    older_visit_count = monthly_visit_sql.ColumnInt(0);
   UMA_HISTOGRAM_COUNTS("History.MonthlyVisitCount",
-                       monthly_visit_sql.ColumnInt(0) + weekly_visit_count);
+                       older_visit_count + weekly_visit_count);
 
   UMA_HISTOGRAM_TIMES("History.DatabaseBasicMetricsTime",
                       base::TimeTicks::Now() - start_time);
 
   // Compute the advanced metrics even less often, pending timing data showing
   // that's not necessary.
   if (base::RandInt(1, 3) == 3) {
     start_time = base::TimeTicks::Now();
 
     // Collect all URLs visited within the last month.
@@ skipping 351 matching lines @@
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
 
   // Erase all the full text index files. These will take a while to update and
   // are less important, so we just blow them away. Same with the archived
   // database.
   needs_version_17_migration_ = true;
 }
 #endif
 
 }  // namespace history