Add Precache.CacheStatus.NonPrefetch.FromPrecache.

components/precache/core/precache_url_table.cc

 // Copyright 2013 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 "components/precache/core/precache_url_table.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 
 using sql::Statement;
 
 namespace {
 
 // Returns the spec of the given URL.
 std::string GetKey(const GURL& url) {
   return url.spec();
 }
 
 }  // namespace
 
 namespace precache {
 
+bool PrecacheURLInfo::operator==(const PrecacheURLInfo& other) const {
+  return was_precached == other.was_precached &&
+         is_precached == other.is_precached && was_used == other.was_used;
+}
+
 PrecacheURLTable::PrecacheURLTable() : db_(NULL) {}
 
 PrecacheURLTable::~PrecacheURLTable() {}
 
 bool PrecacheURLTable::Init(sql::Connection* db) {
   DCHECK(!db_);  // Init must only be called once.
   DCHECK(db);    // The database connection must be non-NULL.
   db_ = db;
   return CreateTableIfNonExistent();
 }
 
 void PrecacheURLTable::AddURL(const GURL& url,
                               int64_t referrer_host_id,
                               bool is_precached,
                               const base::Time& precache_time) {
   Statement statement(
       db_->GetCachedStatement(SQL_FROM_HERE,
                               "INSERT OR REPLACE INTO precache_urls (url, "
                               "referrer_host_id, was_used, is_precached, time) "
                               "VALUES(?,?,0,?,?)"));
 
   statement.BindString(0, GetKey(url));
   statement.BindInt64(1, referrer_host_id);
   statement.BindInt64(2, is_precached ? 1 : 0);
   statement.BindInt64(3, precache_time.ToInternalValue());
   statement.Run();
 }
 
-bool PrecacheURLTable::IsURLPrecached(const GURL& url) {
+PrecacheURLInfo PrecacheURLTable::GetURLInfo(const GURL& url) {
   Statement statement(db_->GetCachedStatement(
       SQL_FROM_HERE,
-      "SELECT time FROM precache_urls WHERE url=? and is_precached=1"));
+      "SELECT is_precached, was_used FROM precache_urls WHERE url=?"));
+  statement.BindString(0, GetKey(url));
 
-  statement.BindString(0, GetKey(url));
-  return statement.Step();
-}
-
-bool PrecacheURLTable::IsURLPrecachedAndUnused(const GURL& url) {
-  Statement statement(db_->GetCachedStatement(SQL_FROM_HERE,
-                                              "SELECT time FROM precache_urls "
-                                              "WHERE url=? and is_precached=1 "
-                                              "and was_used=0"));
-
-  statement.BindString(0, GetKey(url));
-  return statement.Step();
+  if (statement.Step()) {
+    return {/*present=*/true, /*is_precached=*/statement.ColumnBool(0),
+            /*was_used==*/statement.ColumnBool(1)};
+  } else {
+    return {/*present=*/false, /*is_precached=*/false, /*was_used=*/false};
+  }
 }
 
 void PrecacheURLTable::SetPrecachedURLAsUsed(const GURL& url) {
   Statement statement(
       db_->GetCachedStatement(SQL_FROM_HERE,
                               "UPDATE precache_urls SET was_used=1, "
                               "is_precached=0 "
                               "WHERE url=? and was_used=0 and is_precached=1"));
 
   statement.BindString(0, GetKey(url));
@@ skipping 90 matching lines @@
       return false;
     if (!db_->DoesColumnExist("precache_urls", "referrer_host_id") &&
         !db_->Execute(
             "ALTER TABLE precache_urls ADD COLUMN referrer_host_id INTEGER"))
       return false;
   }
   return true;
 }
 
 }  // namespace precache