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

Unified Diff: content/browser/fileapi/file_system_quota_client_unittest.cc

Issue 137923003: Change fileapi namespace to content for files that are moved under content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 6 years, 11 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
Index: content/browser/fileapi/file_system_quota_client_unittest.cc
diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc
index c4baa4f8aa6ca8892cc9b7f6be09f0776792e38e..20e2b5f086e816fb4ac9804e86668aa3fe40aeac 100644
--- a/content/browser/fileapi/file_system_quota_client_unittest.cc
+++ b/content/browser/fileapi/file_system_quota_client_unittest.cc
@@ -21,7 +21,12 @@
#include "webkit/common/fileapi/file_system_util.h"
#include "webkit/common/quota/quota_types.h"
-namespace fileapi {
+using fileapi::AsyncFileTestHelper;
+using fileapi::FileSystemQuotaClient;
+using fileapi::FileSystemType;
+using fileapi::FileSystemURL;
+
+namespace content {
namespace {
const char kDummyURL1[] = "http://www.dummy.org";
@@ -78,8 +83,9 @@ class FileSystemQuotaClientTest : public testing::Test {
return usage_;
}
- const std::set<GURL>& GetOriginsForType(FileSystemQuotaClient* quota_client,
- quota::StorageType type) {
+ const std::set<GURL>& GetOriginsForType(
+ FileSystemQuotaClient* quota_client,
+ quota::StorageType type) {
origins_.clear();
quota_client->GetOriginsForType(
type,
@@ -89,9 +95,10 @@ class FileSystemQuotaClientTest : public testing::Test {
return origins_;
}
- const std::set<GURL>& GetOriginsForHost(FileSystemQuotaClient* quota_client,
- quota::StorageType type,
- const std::string& host) {
+ const std::set<GURL>& GetOriginsForHost(
+ FileSystemQuotaClient* quota_client,
+ quota::StorageType type,
+ const std::string& host) {
origins_.clear();
quota_client->GetOriginsForHost(
type, host,
@@ -101,9 +108,10 @@ class FileSystemQuotaClientTest : public testing::Test {
return origins_;
}
- void RunAdditionalOriginUsageTask(FileSystemQuotaClient* quota_client,
- const std::string& origin_url,
- quota::StorageType type) {
+ void RunAdditionalOriginUsageTask(
+ FileSystemQuotaClient* quota_client,
+ const std::string& origin_url,
+ quota::StorageType type) {
quota_client->GetOriginUsage(
GURL(origin_url), type,
base::Bind(&FileSystemQuotaClientTest::OnGetAdditionalUsage,
@@ -113,7 +121,8 @@ class FileSystemQuotaClientTest : public testing::Test {
bool CreateFileSystemDirectory(const base::FilePath& file_path,
const std::string& origin_url,
quota::StorageType storage_type) {
- FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
+ FileSystemType type = fileapi::QuotaStorageTypeToFileSystemType(
+ storage_type);
FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
GURL(origin_url), type, file_path);
@@ -129,7 +138,8 @@ class FileSystemQuotaClientTest : public testing::Test {
if (file_path.empty())
return false;
- FileSystemType type = QuotaStorageTypeToFileSystemType(storage_type);
+ FileSystemType type = fileapi::QuotaStorageTypeToFileSystemType(
+ storage_type);
FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
GURL(origin_url), type, file_path);
@@ -181,7 +191,8 @@ class FileSystemQuotaClientTest : public testing::Test {
GURL(files[i].origin_url) == GURL(origin_url)) {
base::FilePath path = base::FilePath().AppendASCII(files[i].name);
if (!path.empty()) {
- file_paths_cost += ObfuscatedFileUtil::ComputeFilePathCost(path);
+ file_paths_cost += fileapi::ObfuscatedFileUtil::ComputeFilePathCost(
+ path);
}
}
}
@@ -224,7 +235,7 @@ class FileSystemQuotaClientTest : public testing::Test {
base::ScopedTempDir data_dir_;
base::MessageLoop message_loop_;
- scoped_refptr<FileSystemContext> file_system_context_;
+ scoped_refptr<fileapi::FileSystemContext> file_system_context_;
base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_;
int64 usage_;
int additional_callback_count_;
@@ -558,4 +569,4 @@ TEST_F(FileSystemQuotaClientTest, DeleteOriginTest) {
kTemporary));
}
-} // namespace fileapi
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698