Skip to content

GitLab

T
tangled
Commit 037816fc authored by Jdragon's avatar Jdragon Committed by Commit Bot
Browse files
Options

Remove uses of deprecated Time::From/ToInternalValue() 

The CL replaces the calls to Time::From/ToInternalValue() by the more
explicit Time::From/ToDeltaSinceWindowsEpoch(). This change is backwards
compatible.

Bug: 889242
Change-Id: I4df4bab497465e975abc137052010ca2590a77a5
Reviewed-on: https://chromium-review.googlesource.com/1248328
Commit-Queue: Jaeyong Bae <jdragon.bae@gmail.com>
Reviewed-by: default avatarJoshua Bell <jsbell@chromium.org>
Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595319}
parent bc61ab9e
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 45 deletions
storage/browser/quota/quota_database.cc
View file @ 037816fc
......@@ -211,10 +211,12 @@ bool QuotaDatabase::SetOriginLastAccessTime(const url::Origin& origin,
" (used_count, last_access_time, origin, type, last_modified_time)"
" VALUES (?, ?, ?, ?, ?)";
statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE, kSql));
statement.BindInt64(4, last_access_time.ToInternalValue());
statement.BindInt64(
4, last_access_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
}
statement.BindInt(0, entry.used_count);
statement.BindInt64(1, last_access_time.ToInternalValue());
statement.BindInt64(
1, last_access_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
statement.BindString(2, origin.GetURL().spec());
statement.BindInt(3, static_cast<int>(type));
......@@ -246,9 +248,12 @@ bool QuotaDatabase::SetOriginLastModifiedTime(const url::Origin& origin,
"INSERT INTO OriginInfoTable"
" (last_modified_time, origin, type, last_access_time) VALUES (?, ?, ?, ?)";
statement.Assign(db_->GetCachedStatement(SQL_FROM_HERE, kSql));
statement.BindInt64(3, last_modified_time.ToInternalValue());
statement.BindInt64(
3, last_modified_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
}
statement.BindInt64(0, last_modified_time.ToInternalValue());
statement.BindInt64(
0, last_modified_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
statement.BindString(1, origin.GetURL().spec());
statement.BindInt(2, static_cast<int>(type));
......@@ -278,7 +283,8 @@ bool QuotaDatabase::GetOriginLastEvictionTime(const url::Origin& origin,
if (!statement.Step())
return false;
*last_modified_time = base::Time::FromInternalValue(statement.ColumnInt64(0));
*last_modified_time = base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(statement.ColumnInt64(0)));
return true;
}
......@@ -293,7 +299,8 @@ bool QuotaDatabase::SetOriginLastEvictionTime(const url::Origin& origin,
" (last_eviction_time, origin, type)"
" VALUES (?, ?, ?)";
sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE, kSql));
statement.BindInt64(0, last_modified_time.ToInternalValue());
statement.BindInt64(
0, last_modified_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
statement.BindString(1, origin.GetURL().spec());
statement.BindInt(2, static_cast<int>(type));
......@@ -366,8 +373,10 @@ bool QuotaDatabase::GetOriginInfo(const url::Origin& origin,
*entry = OriginInfoTableEntry(
url::Origin::Create(GURL(statement.ColumnString(0))),
static_cast<StorageType>(statement.ColumnInt(1)), statement.ColumnInt(2),
base::Time::FromInternalValue(statement.ColumnInt64(3)),
base::Time::FromInternalValue(statement.ColumnInt64(4)));
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(statement.ColumnInt64(3))),
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(statement.ColumnInt64(4))));
return true;
}
......@@ -474,7 +483,8 @@ bool QuotaDatabase::GetOriginsModifiedSince(StorageType type,
sql::Statement statement(db_->GetCachedStatement(SQL_FROM_HERE, kSql));
statement.BindInt(0, static_cast<int>(type));
statement.BindInt64(1, modified_since.ToInternalValue());
statement.BindInt64(
1, modified_since.ToDeltaSinceWindowsEpoch().InMicroseconds());
origins->clear();
while (statement.Step())
......@@ -757,8 +767,10 @@ bool QuotaDatabase::DumpOriginInfoTable(
url::Origin::Create(GURL(statement.ColumnString(0))),
static_cast<StorageType>(statement.ColumnInt(1)),
statement.ColumnInt(2),
base::Time::FromInternalValue(statement.ColumnInt64(3)),
base::Time::FromInternalValue(statement.ColumnInt64(4)));
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(statement.ColumnInt64(3))),
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(statement.ColumnInt64(4))));
if (!callback.Run(entry))
return true;
......
storage/browser/quota/quota_database_unittest.cc
View file @ 037816fc
......@@ -164,16 +164,24 @@ class QuotaDatabaseTest : public testing::Test {
const url::Origin kOrigin4 = url::Origin::Create(GURL("http://p/"));
// Adding three temporary storages, and
EXPECT_TRUE(db.SetOriginLastAccessTime(kOrigin1, kTemporary,
base::Time::FromInternalValue(10)));
EXPECT_TRUE(db.SetOriginLastAccessTime(kOrigin2, kTemporary,
base::Time::FromInternalValue(20)));
EXPECT_TRUE(db.SetOriginLastAccessTime(kOrigin3, kTemporary,
base::Time::FromInternalValue(30)));
EXPECT_TRUE(
db.SetOriginLastAccessTime(kOrigin1, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(10))));
EXPECT_TRUE(
db.SetOriginLastAccessTime(kOrigin2, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(20))));
EXPECT_TRUE(
db.SetOriginLastAccessTime(kOrigin3, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(30))));
// one persistent.
EXPECT_TRUE(db.SetOriginLastAccessTime(kOrigin4, kPersistent,
base::Time::FromInternalValue(40)));
EXPECT_TRUE(
db.SetOriginLastAccessTime(kOrigin4, kPersistent,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(40))));
EXPECT_TRUE(db.GetLRUOrigin(kTemporary, exceptions, nullptr, &origin));
EXPECT_EQ(kOrigin1, origin);
......@@ -234,12 +242,18 @@ class QuotaDatabaseTest : public testing::Test {
const url::Origin kOrigin3 = url::Origin::Create(GURL("http://c/"));
// Report last mod time for the test origins.
EXPECT_TRUE(db.SetOriginLastModifiedTime(kOrigin1, kTemporary,
base::Time::FromInternalValue(0)));
EXPECT_TRUE(db.SetOriginLastModifiedTime(
kOrigin2, kTemporary, base::Time::FromInternalValue(10)));
kOrigin1, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(0))));
EXPECT_TRUE(db.SetOriginLastModifiedTime(
kOrigin2, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(10))));
EXPECT_TRUE(db.SetOriginLastModifiedTime(
kOrigin3, kTemporary, base::Time::FromInternalValue(20)));
kOrigin3, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(20))));
EXPECT_TRUE(db.GetOriginsModifiedSince(kTemporary, &origins, base::Time()));
EXPECT_EQ(3U, origins.size());
......@@ -247,31 +261,41 @@ class QuotaDatabaseTest : public testing::Test {
EXPECT_EQ(1U, origins.count(kOrigin2));
EXPECT_EQ(1U, origins.count(kOrigin3));
EXPECT_TRUE(db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromInternalValue(5)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(5))));
EXPECT_EQ(2U, origins.size());
EXPECT_EQ(0U, origins.count(kOrigin1));
EXPECT_EQ(1U, origins.count(kOrigin2));
EXPECT_EQ(1U, origins.count(kOrigin3));
EXPECT_TRUE(db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromInternalValue(15)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(15))));
EXPECT_EQ(1U, origins.size());
EXPECT_EQ(0U, origins.count(kOrigin1));
EXPECT_EQ(0U, origins.count(kOrigin2));
EXPECT_EQ(1U, origins.count(kOrigin3));
EXPECT_TRUE(db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromInternalValue(25)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(25))));
EXPECT_TRUE(origins.empty());
// Update origin1's mod time but for persistent storage.
EXPECT_TRUE(db.SetOriginLastModifiedTime(
kOrigin1, kPersistent, base::Time::FromInternalValue(30)));
kOrigin1, kPersistent,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(30))));
// Must have no effects on temporary origins info.
EXPECT_TRUE(db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromInternalValue(5)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kTemporary, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(5))));
EXPECT_EQ(2U, origins.size());
EXPECT_EQ(0U, origins.count(kOrigin1));
EXPECT_EQ(1U, origins.count(kOrigin2));
......@@ -279,17 +303,23 @@ class QuotaDatabaseTest : public testing::Test {
// One more update for persistent origin2.
EXPECT_TRUE(db.SetOriginLastModifiedTime(
kOrigin2, kPersistent, base::Time::FromInternalValue(40)));
kOrigin2, kPersistent,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(40))));
EXPECT_TRUE(db.GetOriginsModifiedSince(kPersistent, &origins,
base::Time::FromInternalValue(25)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kPersistent, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(25))));
EXPECT_EQ(2U, origins.size());
EXPECT_EQ(1U, origins.count(kOrigin1));
EXPECT_EQ(1U, origins.count(kOrigin2));
EXPECT_EQ(0U, origins.count(kOrigin3));
EXPECT_TRUE(db.GetOriginsModifiedSince(kPersistent, &origins,
base::Time::FromInternalValue(35)));
EXPECT_TRUE(
db.GetOriginsModifiedSince(kPersistent, &origins,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(35))));
EXPECT_EQ(1U, origins.size());
EXPECT_EQ(0U, origins.count(kOrigin1));
EXPECT_EQ(1U, origins.count(kOrigin2));
......@@ -311,21 +341,33 @@ class QuotaDatabaseTest : public testing::Test {
// Report last eviction time for the test origins.
EXPECT_TRUE(db.SetOriginLastEvictionTime(
kOrigin1, kTemporary, base::Time::FromInternalValue(10)));
kOrigin1, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(10))));
EXPECT_TRUE(db.SetOriginLastEvictionTime(
kOrigin2, kTemporary, base::Time::FromInternalValue(20)));
kOrigin2, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(20))));
EXPECT_TRUE(db.SetOriginLastEvictionTime(
kOrigin3, kTemporary, base::Time::FromInternalValue(30)));
kOrigin3, kTemporary,
base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(30))));
EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin1, kTemporary,
&last_eviction_time));
EXPECT_EQ(base::Time::FromInternalValue(10), last_eviction_time);
EXPECT_EQ(base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(10)),
last_eviction_time);
EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin2, kTemporary,
&last_eviction_time));
EXPECT_EQ(base::Time::FromInternalValue(20), last_eviction_time);
EXPECT_EQ(base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(20)),
last_eviction_time);
EXPECT_TRUE(db.GetOriginLastEvictionTime(kOrigin3, kTemporary,
&last_eviction_time));
EXPECT_EQ(base::Time::FromInternalValue(30), last_eviction_time);
EXPECT_EQ(base::Time::FromDeltaSinceWindowsEpoch(
base::TimeDelta::FromMicroseconds(30)),
last_eviction_time);
// Delete last eviction times for the test origins.
EXPECT_TRUE(db.DeleteOriginLastEvictionTime(kOrigin1, kTemporary));
......@@ -505,8 +547,11 @@ class QuotaDatabaseTest : public testing::Test {
statement.BindString(0, itr->origin.GetURL().spec());
statement.BindInt(1, static_cast<int>(itr->type));
statement.BindInt(2, itr->used_count);
statement.BindInt64(3, itr->last_access_time.ToInternalValue());
statement.BindInt64(4, itr->last_modified_time.ToInternalValue());
statement.BindInt64(
3, itr->last_access_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
statement.BindInt64(
4,
itr->last_modified_time.ToDeltaSinceWindowsEpoch().InMicroseconds());
EXPECT_TRUE(statement.Run());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment