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

Unified Diff: content/browser/fileapi/transient_file_util_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/transient_file_util_unittest.cc
diff --git a/content/browser/fileapi/transient_file_util_unittest.cc b/content/browser/fileapi/transient_file_util_unittest.cc
index 2ddb315c55f98a3d80131b9b52a67f7aa15278cf..66d4ad5ba2ff302b3a79fae8258cd7369bdc11e5 100644
--- a/content/browser/fileapi/transient_file_util_unittest.cc
+++ b/content/browser/fileapi/transient_file_util_unittest.cc
@@ -17,7 +17,9 @@
#include "webkit/browser/fileapi/transient_file_util.h"
#include "webkit/common/blob/scoped_file.h"
-namespace fileapi {
+using fileapi::FileSystemURL;
+
+namespace content {
class TransientFileUtilTest : public testing::Test {
public:
@@ -27,7 +29,7 @@ class TransientFileUtilTest : public testing::Test {
virtual void SetUp() OVERRIDE {
file_system_context_ = CreateFileSystemContextForTesting(
NULL, base::FilePath(FILE_PATH_LITERAL("dummy")));
- transient_file_util_.reset(new TransientFileUtil);
+ transient_file_util_.reset(new fileapi::TransientFileUtil);
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
}
@@ -41,10 +43,11 @@ class TransientFileUtilTest : public testing::Test {
FileSystemURL* file_url,
base::FilePath* file_path) {
EXPECT_TRUE(base::CreateTemporaryFileInDir(data_dir_.path(), file_path));
- IsolatedContext* isolated_context = IsolatedContext::GetInstance();
+ fileapi::IsolatedContext* isolated_context =
+ fileapi::IsolatedContext::GetInstance();
std::string name = "tmp";
std::string fsid = isolated_context->RegisterFileSystemForPath(
- kFileSystemTypeForTransientFile,
+ fileapi::kFileSystemTypeForTransientFile,
*file_path,
&name);
ASSERT_TRUE(!fsid.empty());
@@ -52,22 +55,24 @@ class TransientFileUtilTest : public testing::Test {
fsid).AppendASCII(name);
*file_url = file_system_context_->CreateCrackedFileSystemURL(
GURL("http://foo"),
- kFileSystemTypeIsolated,
+ fileapi::kFileSystemTypeIsolated,
virtual_path);
}
- scoped_ptr<FileSystemOperationContext> NewOperationContext() {
+ scoped_ptr<fileapi::FileSystemOperationContext> NewOperationContext() {
return make_scoped_ptr(
- new FileSystemOperationContext(file_system_context_.get()));
+ new fileapi::FileSystemOperationContext(file_system_context_.get()));
}
- FileSystemFileUtil* file_util() { return transient_file_util_.get(); }
+ fileapi::FileSystemFileUtil* file_util() {
+ return transient_file_util_.get();
+ }
private:
base::MessageLoop message_loop_;
base::ScopedTempDir data_dir_;
- scoped_refptr<FileSystemContext> file_system_context_;
- scoped_ptr<TransientFileUtil> transient_file_util_;
+ scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+ scoped_ptr<fileapi::TransientFileUtil> transient_file_util_;
DISALLOW_COPY_AND_ASSIGN(TransientFileUtilTest);
};
@@ -118,4 +123,4 @@ TEST_F(TransientFileUtilTest, TransientFile) {
temp_url, &file_info, &path));
}
-} // namespace fileapi
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698