Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: storage/browser/database/database_quota_client_unittest.cc

Issue 2776253002: Move some database tests next to the files they cover. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « storage/browser/BUILD.gn ('k') | storage/browser/database/database_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: storage/browser/database/database_quota_client_unittest.cc
diff --git a/content/browser/database_quota_client_unittest.cc b/storage/browser/database/database_quota_client_unittest.cc
similarity index 95%
rename from content/browser/database_quota_client_unittest.cc
rename to storage/browser/database/database_quota_client_unittest.cc
index 291ef2c73b637a8e2238a2459f9c14c05b04e48a..7aa592727da7cc7c0babe494f6c406d3ef09b329 100644
--- a/content/browser/database_quota_client_unittest.cc
+++ b/storage/browser/database/database_quota_client_unittest.cc
@@ -54,8 +54,7 @@ class MockDatabaseTracker : public DatabaseTracker {
bool GetAllOriginIdentifiers(
std::vector<std::string>* origins_identifiers) override {
std::map<GURL, MockOriginInfo>::const_iterator iter;
- for (iter = mock_origin_infos_.begin();
- iter != mock_origin_infos_.end();
+ for (iter = mock_origin_infos_.begin(); iter != mock_origin_infos_.end();
++iter) {
origins_identifiers->push_back(iter->second.GetOriginIdentifier());
}
@@ -64,8 +63,7 @@ class MockDatabaseTracker : public DatabaseTracker {
bool GetAllOriginsInfo(std::vector<OriginInfo>* origins_info) override {
std::map<GURL, MockOriginInfo>::const_iterator iter;
- for (iter = mock_origin_infos_.begin();
- iter != mock_origin_infos_.end();
+ for (iter = mock_origin_infos_.begin(); iter != mock_origin_infos_.end();
++iter) {
origins_info->push_back(OriginInfo(iter->second));
}
@@ -88,7 +86,7 @@ class MockDatabaseTracker : public DatabaseTracker {
callback.Run(net::OK);
}
- void AddMockDatabase(const GURL& origin, const char* name, int size) {
+ void AddMockDatabase(const GURL& origin, const char* name, int size) {
MockOriginInfo& info = mock_origin_infos_[origin];
info.set_origin(storage::GetIdentifierFromOrigin(origin));
info.AddMockDatabase(base::ASCIIToUTF16(name), size);
@@ -120,7 +118,6 @@ class MockDatabaseTracker : public DatabaseTracker {
std::map<GURL, MockOriginInfo> mock_origin_infos_;
};
-
// Base class for our test fixtures.
class DatabaseQuotaClientTest : public testing::Test {
public:
@@ -134,8 +131,7 @@ class DatabaseQuotaClientTest : public testing::Test {
kOriginOther("http://other"),
usage_(0),
mock_tracker_(new MockDatabaseTracker),
- weak_factory_(this) {
- }
+ weak_factory_(this) {}
int64_t GetOriginUsage(storage::QuotaClient* client,
const GURL& origin,
@@ -153,9 +149,8 @@ class DatabaseQuotaClientTest : public testing::Test {
storage::StorageType type) {
origins_.clear();
client->GetOriginsForType(
- type,
- base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete,
- weak_factory_.GetWeakPtr()));
+ type, base::Bind(&DatabaseQuotaClientTest::OnGetOriginsComplete,
+ weak_factory_.GetWeakPtr()));
base::RunLoop().RunUntilIdle();
return origins_;
}
@@ -186,7 +181,6 @@ class DatabaseQuotaClientTest : public testing::Test {
MockDatabaseTracker* mock_tracker() { return mock_tracker_.get(); }
-
private:
void OnGetOriginUsageComplete(int64_t usage) { usage_ = usage; }
@@ -206,7 +200,6 @@ class DatabaseQuotaClientTest : public testing::Test {
base::WeakPtrFactory<DatabaseQuotaClientTest> weak_factory_;
};
-
TEST_F(DatabaseQuotaClientTest, GetOriginUsage) {
DatabaseQuotaClient client(base::ThreadTaskRunnerHandle::Get().get(),
mock_tracker());
« no previous file with comments | « storage/browser/BUILD.gn ('k') | storage/browser/database/database_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698