summaryrefslogtreecommitdiffstats
path: root/content/child/fileapi
diff options
context:
space:
mode:
Diffstat (limited to 'content/child/fileapi')
-rw-r--r--content/child/fileapi/webfilesystem_impl.cc58
-rw-r--r--content/child/fileapi/webfilesystem_impl.h80
-rw-r--r--content/child/fileapi/webfilewriter_base.cc6
-rw-r--r--content/child/fileapi/webfilewriter_base.h10
-rw-r--r--content/child/fileapi/webfilewriter_base_unittest.cc38
-rw-r--r--content/child/fileapi/webfilewriter_impl.cc2
-rw-r--r--content/child/fileapi/webfilewriter_impl.h2
7 files changed, 98 insertions, 98 deletions
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 1d72fa3..640c1a9 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -25,12 +25,12 @@
#include "webkit/common/fileapi/file_system_util.h"
#include "webkit/glue/webkit_glue.h"
-using WebKit::WebFileInfo;
-using WebKit::WebFileSystemCallbacks;
-using WebKit::WebFileSystemEntry;
-using WebKit::WebString;
-using WebKit::WebURL;
-using WebKit::WebVector;
+using blink::WebFileInfo;
+using blink::WebFileSystemCallbacks;
+using blink::WebFileSystemEntry;
+using blink::WebString;
+using blink::WebURL;
+using blink::WebVector;
using webkit_glue::WorkerTaskRunner;
namespace content {
@@ -165,7 +165,7 @@ void ResolveURLCallbackAdapter(
thread_id, callbacks_id, waitable_results,
&WebFileSystemCallbacks::didResolveURL,
MakeTuple(UTF8ToUTF16(info.name), info.root_url,
- static_cast<WebKit::WebFileSystemType>(info.mount_type),
+ static_cast<blink::WebFileSystemType>(info.mount_type),
normalized_path.AsUTF16Unsafe(), is_directory));
}
@@ -214,7 +214,7 @@ void ReadDirectoryCallbackAdapater(
void DidCreateFileWriter(
int callbacks_id,
const GURL& path,
- WebKit::WebFileWriterClient* client,
+ blink::WebFileWriterClient* client,
base::MessageLoopProxy* main_thread_loop,
const base::PlatformFileInfo& file_info) {
WebFileSystemImpl* filesystem =
@@ -226,7 +226,7 @@ void DidCreateFileWriter(
filesystem->GetAndUnregisterCallbacks(callbacks_id);
if (file_info.is_directory || file_info.size < 0) {
- callbacks.didFail(WebKit::WebFileErrorInvalidState);
+ callbacks.didFail(blink::WebFileErrorInvalidState);
return;
}
WebFileWriterImpl::Type type =
@@ -242,7 +242,7 @@ void CreateFileWriterCallbackAdapter(
WaitableCallbackResults* waitable_results,
base::MessageLoopProxy* main_thread_loop,
const GURL& path,
- WebKit::WebFileWriterClient* client,
+ blink::WebFileWriterClient* client,
const base::PlatformFileInfo& file_info) {
DispatchResultsClosure(
thread_id, callbacks_id, waitable_results,
@@ -325,8 +325,8 @@ void WebFileSystemImpl::OnWorkerRunLoopStopped() {
}
void WebFileSystemImpl::openFileSystem(
- const WebKit::WebURL& storage_partition,
- WebKit::WebFileSystemType type,
+ const blink::WebURL& storage_partition,
+ blink::WebFileSystemType type,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -346,7 +346,7 @@ void WebFileSystemImpl::openFileSystem(
}
void WebFileSystemImpl::resolveURL(
- const WebKit::WebURL& filesystem_url,
+ const blink::WebURL& filesystem_url,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -365,8 +365,8 @@ void WebFileSystemImpl::resolveURL(
}
void WebFileSystemImpl::deleteFileSystem(
- const WebKit::WebURL& storage_partition,
- WebKit::WebFileSystemType type,
+ const blink::WebURL& storage_partition,
+ blink::WebFileSystemType type,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -383,8 +383,8 @@ void WebFileSystemImpl::deleteFileSystem(
}
void WebFileSystemImpl::move(
- const WebKit::WebURL& src_path,
- const WebKit::WebURL& dest_path,
+ const blink::WebURL& src_path,
+ const blink::WebURL& dest_path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -400,8 +400,8 @@ void WebFileSystemImpl::move(
}
void WebFileSystemImpl::copy(
- const WebKit::WebURL& src_path,
- const WebKit::WebURL& dest_path,
+ const blink::WebURL& src_path,
+ const blink::WebURL& dest_path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -417,7 +417,7 @@ void WebFileSystemImpl::copy(
}
void WebFileSystemImpl::remove(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -433,7 +433,7 @@ void WebFileSystemImpl::remove(
}
void WebFileSystemImpl::removeRecursively(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -449,7 +449,7 @@ void WebFileSystemImpl::removeRecursively(
}
void WebFileSystemImpl::readMetadata(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -468,7 +468,7 @@ void WebFileSystemImpl::readMetadata(
}
void WebFileSystemImpl::createFile(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
bool exclusive,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
@@ -485,7 +485,7 @@ void WebFileSystemImpl::createFile(
}
void WebFileSystemImpl::createDirectory(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
bool exclusive,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
@@ -502,7 +502,7 @@ void WebFileSystemImpl::createDirectory(
}
void WebFileSystemImpl::fileExists(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -518,7 +518,7 @@ void WebFileSystemImpl::fileExists(
}
void WebFileSystemImpl::directoryExists(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -534,7 +534,7 @@ void WebFileSystemImpl::directoryExists(
}
void WebFileSystemImpl::readDirectory(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -554,7 +554,7 @@ base::Unretained(waitable_results))),
void WebFileSystemImpl::createFileWriter(
const WebURL& path,
- WebKit::WebFileWriterClient* client,
+ blink::WebFileWriterClient* client,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
@@ -574,7 +574,7 @@ void WebFileSystemImpl::createFileWriter(
}
void WebFileSystemImpl::createSnapshotFileAndReadMetadata(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
WebFileSystemCallbacks callbacks) {
int callbacks_id = RegisterCallbacks(callbacks);
WaitableCallbackResults* waitable_results =
diff --git a/content/child/fileapi/webfilesystem_impl.h b/content/child/fileapi/webfilesystem_impl.h
index 5998efd..d37f9a3 100644
--- a/content/child/fileapi/webfilesystem_impl.h
+++ b/content/child/fileapi/webfilesystem_impl.h
@@ -18,7 +18,7 @@ namespace base {
class MessageLoopProxy;
}
-namespace WebKit {
+namespace blink {
class WebURL;
class WebFileWriter;
class WebFileWriterClient;
@@ -27,7 +27,7 @@ class WebFileWriterClient;
namespace content {
class WebFileSystemImpl
- : public WebKit::WebFileSystem,
+ : public blink::WebFileSystem,
public webkit_glue::WorkerTaskRunner::Observer,
public base::NonThreadSafe {
public:
@@ -50,64 +50,64 @@ class WebFileSystemImpl
// WebFileSystem implementation.
virtual void openFileSystem(
- const WebKit::WebURL& storage_partition,
- const WebKit::WebFileSystemType type,
- WebKit::WebFileSystemCallbacks);
+ const blink::WebURL& storage_partition,
+ const blink::WebFileSystemType type,
+ blink::WebFileSystemCallbacks);
virtual void resolveURL(
- const WebKit::WebURL& filesystem_url,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& filesystem_url,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void deleteFileSystem(
- const WebKit::WebURL& storage_partition,
- const WebKit::WebFileSystemType type,
- WebKit::WebFileSystemCallbacks);
+ const blink::WebURL& storage_partition,
+ const blink::WebFileSystemType type,
+ blink::WebFileSystemCallbacks);
virtual void move(
- const WebKit::WebURL& src_path,
- const WebKit::WebURL& dest_path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& src_path,
+ const blink::WebURL& dest_path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void copy(
- const WebKit::WebURL& src_path,
- const WebKit::WebURL& dest_path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& src_path,
+ const blink::WebURL& dest_path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void remove(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void removeRecursively(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void readMetadata(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void createFile(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
bool exclusive,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void createDirectory(
- const WebKit::WebURL& path,
+ const blink::WebURL& path,
bool exclusive,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void fileExists(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void directoryExists(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void readDirectory(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void createFileWriter(
- const WebKit::WebURL& path,
- WebKit::WebFileWriterClient*,
- WebKit::WebFileSystemCallbacks) OVERRIDE;
+ const blink::WebURL& path,
+ blink::WebFileWriterClient*,
+ blink::WebFileSystemCallbacks) OVERRIDE;
virtual void createSnapshotFileAndReadMetadata(
- const WebKit::WebURL& path,
- WebKit::WebFileSystemCallbacks);
+ const blink::WebURL& path,
+ blink::WebFileSystemCallbacks);
- int RegisterCallbacks(const WebKit::WebFileSystemCallbacks& callbacks);
- WebKit::WebFileSystemCallbacks GetAndUnregisterCallbacks(
+ int RegisterCallbacks(const blink::WebFileSystemCallbacks& callbacks);
+ blink::WebFileSystemCallbacks GetAndUnregisterCallbacks(
int callbacks_id);
private:
- typedef std::map<int, WebKit::WebFileSystemCallbacks> CallbacksMap;
+ typedef std::map<int, blink::WebFileSystemCallbacks> CallbacksMap;
scoped_refptr<base::MessageLoopProxy> main_thread_loop_;
diff --git a/content/child/fileapi/webfilewriter_base.cc b/content/child/fileapi/webfilewriter_base.cc
index 5a97b57..cde644b 100644
--- a/content/child/fileapi/webfilewriter_base.cc
+++ b/content/child/fileapi/webfilewriter_base.cc
@@ -15,7 +15,7 @@ using fileapi::PlatformFileErrorToWebFileError;
namespace content {
WebFileWriterBase::WebFileWriterBase(const GURL& path,
- WebKit::WebFileWriterClient* client)
+ blink::WebFileWriterClient* client)
: path_(path),
client_(client),
operation_(kOperationNone),
@@ -32,7 +32,7 @@ void WebFileWriterBase::truncate(long long length) {
void WebFileWriterBase::write(
long long position,
- const WebKit::WebString& id) {
+ const blink::WebString& id) {
DCHECK_EQ(kOperationNone, operation_);
DCHECK_EQ(kCancelNotInProgress, cancel_state_);
operation_ = kOperationWrite;
@@ -147,7 +147,7 @@ void WebFileWriterBase::FinishCancel() {
DCHECK(kOperationNone != operation_);
cancel_state_ = kCancelNotInProgress;
operation_ = kOperationNone;
- client_->didFail(WebKit::WebFileErrorAbort);
+ client_->didFail(blink::WebFileErrorAbort);
}
} // namespace content
diff --git a/content/child/fileapi/webfilewriter_base.h b/content/child/fileapi/webfilewriter_base.h
index af63ffb..5168e3c 100644
--- a/content/child/fileapi/webfilewriter_base.h
+++ b/content/child/fileapi/webfilewriter_base.h
@@ -10,7 +10,7 @@
#include "third_party/WebKit/public/platform/WebFileWriter.h"
#include "url/gurl.h"
-namespace WebKit {
+namespace blink {
class WebFileWriterClient;
class WebURL;
}
@@ -18,14 +18,14 @@ class WebURL;
namespace content {
class CONTENT_EXPORT WebFileWriterBase
- : public NON_EXPORTED_BASE(WebKit::WebFileWriter) {
+ : public NON_EXPORTED_BASE(blink::WebFileWriter) {
public:
- WebFileWriterBase(const GURL& path, WebKit::WebFileWriterClient* client);
+ WebFileWriterBase(const GURL& path, blink::WebFileWriterClient* client);
virtual ~WebFileWriterBase();
// WebFileWriter implementation
virtual void truncate(long long length);
- virtual void write(long long position, const WebKit::WebString& id);
+ virtual void write(long long position, const blink::WebString& id);
virtual void cancel();
protected:
@@ -61,7 +61,7 @@ class CONTENT_EXPORT WebFileWriterBase
void FinishCancel();
GURL path_;
- WebKit::WebFileWriterClient* client_;
+ blink::WebFileWriterClient* client_;
OperationType operation_;
CancelState cancel_state_;
};
diff --git a/content/child/fileapi/webfilewriter_base_unittest.cc b/content/child/fileapi/webfilewriter_base_unittest.cc
index 95c849a..95e0ba5 100644
--- a/content/child/fileapi/webfilewriter_base_unittest.cc
+++ b/content/child/fileapi/webfilewriter_base_unittest.cc
@@ -39,7 +39,7 @@ GURL mock_path_as_gurl() {
class TestableFileWriter : public WebFileWriterBase {
public:
- explicit TestableFileWriter(WebKit::WebFileWriterClient* client)
+ explicit TestableFileWriter(blink::WebFileWriterClient* client)
: WebFileWriterBase(mock_path_as_gurl(), client) {
reset();
}
@@ -128,13 +128,13 @@ class TestableFileWriter : public WebFileWriterBase {
};
class FileWriterTest : public testing::Test,
- public WebKit::WebFileWriterClient {
+ public blink::WebFileWriterClient {
public:
FileWriterTest() {
reset();
}
- WebKit::WebFileWriter* writer() {
+ blink::WebFileWriter* writer() {
return testable_writer_.get();
}
@@ -157,7 +157,7 @@ class FileWriterTest : public testing::Test,
testable_writer_.reset(NULL);
}
- virtual void didFail(WebKit::WebFileError error) {
+ virtual void didFail(blink::WebFileError error) {
EXPECT_FALSE(received_did_fail_);
received_did_fail_ = true;
fail_error_received_ = error;
@@ -174,7 +174,7 @@ class FileWriterTest : public testing::Test,
received_did_write_complete_ = false;
received_did_truncate_ = false;
received_did_fail_ = false;
- fail_error_received_ = static_cast<WebKit::WebFileError>(0);
+ fail_error_received_ = static_cast<blink::WebFileError>(0);
}
scoped_ptr<TestableFileWriter> testable_writer_;
@@ -186,7 +186,7 @@ class FileWriterTest : public testing::Test,
bool received_did_write_complete_;
bool received_did_truncate_;
bool received_did_fail_;
- WebKit::WebFileError fail_error_received_;
+ blink::WebFileError fail_error_received_;
DISALLOW_COPY_AND_ASSIGN(FileWriterTest);
};
@@ -195,7 +195,7 @@ TEST_F(FileWriterTest, BasicFileWrite) {
// Call the webkit facing api.
const std::string kBlobId("1234");
writer()->write(kBasicFileWrite_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
// Check that the derived class gets called correctly.
EXPECT_TRUE(testable_writer_->received_write_);
@@ -238,7 +238,7 @@ TEST_F(FileWriterTest, ErrorFileWrite) {
// Call the webkit facing api.
const std::string kBlobId("1234");
writer()->write(kErrorFileWrite_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
// Check that the derived class gets called correctly.
EXPECT_TRUE(testable_writer_->received_write_);
@@ -252,7 +252,7 @@ TEST_F(FileWriterTest, ErrorFileWrite) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorNotFound, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorNotFound, fail_error_received_);
EXPECT_EQ(0, received_did_write_count_);
EXPECT_FALSE(received_did_truncate_);
}
@@ -272,7 +272,7 @@ TEST_F(FileWriterTest, ErrorFileTruncate) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorNotFound, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorNotFound, fail_error_received_);
EXPECT_FALSE(received_did_truncate_);
EXPECT_EQ(0, received_did_write_count_);
}
@@ -281,7 +281,7 @@ TEST_F(FileWriterTest, MultiFileWrite) {
// Call the webkit facing api.
const std::string kBlobId("1234");
writer()->write(kMultiFileWrite_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
// Check that the derived class gets called correctly.
EXPECT_TRUE(testable_writer_->received_write_);
@@ -305,7 +305,7 @@ TEST_F(FileWriterTest, CancelFileWriteBeforeCompletion) {
// Call the webkit facing api.
const std::string kBlobId("1234");
writer()->write(kCancelFileWriteBeforeCompletion_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
// Check that the derived class gets called correctly.
EXPECT_TRUE(testable_writer_->received_write_);
@@ -319,7 +319,7 @@ TEST_F(FileWriterTest, CancelFileWriteBeforeCompletion) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorAbort, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorAbort, fail_error_received_);
EXPECT_EQ(1, received_did_write_count_);
EXPECT_FALSE(received_did_write_complete_);
EXPECT_EQ(1, received_did_write_bytes_total_);
@@ -330,7 +330,7 @@ TEST_F(FileWriterTest, CancelFileWriteAfterCompletion) {
// Call the webkit facing api.
const std::string kBlobId("1234");
writer()->write(kCancelFileWriteAfterCompletion_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
// Check that the derived class gets called correctly.
EXPECT_TRUE(testable_writer_->received_write_);
@@ -344,7 +344,7 @@ TEST_F(FileWriterTest, CancelFileWriteAfterCompletion) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorAbort, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorAbort, fail_error_received_);
EXPECT_EQ(1, received_did_write_count_);
EXPECT_FALSE(received_did_write_complete_);
EXPECT_EQ(1, received_did_write_bytes_total_);
@@ -366,7 +366,7 @@ TEST_F(FileWriterTest, CancelFileTruncate) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorAbort, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorAbort, fail_error_received_);
EXPECT_FALSE(received_did_truncate_);
EXPECT_EQ(0, received_did_write_count_);
}
@@ -386,7 +386,7 @@ TEST_F(FileWriterTest, CancelFailedTruncate) {
// Check that the client gets called correctly.
EXPECT_TRUE(received_did_fail_);
- EXPECT_EQ(WebKit::WebFileErrorAbort, fail_error_received_);
+ EXPECT_EQ(blink::WebFileErrorAbort, fail_error_received_);
EXPECT_FALSE(received_did_truncate_);
EXPECT_EQ(0, received_did_write_count_);
}
@@ -395,7 +395,7 @@ TEST_F(FileWriterTest, DeleteInCompletionCallbacks) {
const std::string kBlobId("1234");
delete_in_client_callback_ = true;
writer()->write(kBasicFileWrite_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
EXPECT_FALSE(testable_writer_.get());
reset();
@@ -406,7 +406,7 @@ TEST_F(FileWriterTest, DeleteInCompletionCallbacks) {
reset();
delete_in_client_callback_ = true;
writer()->write(kErrorFileWrite_Offset,
- WebKit::WebString::fromUTF8(kBlobId));
+ blink::WebString::fromUTF8(kBlobId));
EXPECT_FALSE(testable_writer_.get());
reset();
diff --git a/content/child/fileapi/webfilewriter_impl.cc b/content/child/fileapi/webfilewriter_impl.cc
index bd5fbe3..7077e9a 100644
--- a/content/child/fileapi/webfilewriter_impl.cc
+++ b/content/child/fileapi/webfilewriter_impl.cc
@@ -122,7 +122,7 @@ class WebFileWriterImpl::WriterBridge
};
WebFileWriterImpl::WebFileWriterImpl(
- const GURL& path, WebKit::WebFileWriterClient* client,
+ const GURL& path, blink::WebFileWriterClient* client,
Type type,
base::MessageLoopProxy* main_thread_loop)
: WebFileWriterBase(path, client),
diff --git a/content/child/fileapi/webfilewriter_impl.h b/content/child/fileapi/webfilewriter_impl.h
index c92ea1e..34f63bd 100644
--- a/content/child/fileapi/webfilewriter_impl.h
+++ b/content/child/fileapi/webfilewriter_impl.h
@@ -24,7 +24,7 @@ class WebFileWriterImpl : public WebFileWriterBase,
};
WebFileWriterImpl(const GURL& path,
- WebKit::WebFileWriterClient* client,
+ blink::WebFileWriterClient* client,
Type type,
base::MessageLoopProxy* main_thread_loop);
virtual ~WebFileWriterImpl();
generated by cgit v1.1 at 2025-02-10 21:32:03 +0000