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

Unified Diff: content/public/test/mock_blob_url_request_context.cc

Issue 146963006: Move blob/mock_blob_url_request_context to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix duplicate GYPI entries (should fix link errors on Android and Win) 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/public/test/mock_blob_url_request_context.cc
diff --git a/webkit/browser/blob/mock_blob_url_request_context.cc b/content/public/test/mock_blob_url_request_context.cc
similarity index 74%
rename from webkit/browser/blob/mock_blob_url_request_context.cc
rename to content/public/test/mock_blob_url_request_context.cc
index 1794a58eb6264223b7956c80b018a239d0fa22cb..1093504370c9f84b185f545191df0f0a5b4a94cd 100644
--- a/webkit/browser/blob/mock_blob_url_request_context.cc
+++ b/content/public/test/mock_blob_url_request_context.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/browser/blob/mock_blob_url_request_context.h"
+#include "content/public/test/mock_blob_url_request_context.h"
#include "webkit/browser/blob/blob_storage_context.h"
#include "webkit/browser/blob/blob_url_request_job.h"
@@ -10,14 +10,14 @@
#include "webkit/common/blob/blob_data.h"
-namespace webkit_blob {
+namespace content {
MockBlobURLRequestContext::MockBlobURLRequestContext(
fileapi::FileSystemContext* file_system_context)
- : blob_storage_context_(new BlobStorageContext) {
+ : blob_storage_context_(new webkit_blob::BlobStorageContext) {
// Job factory owns the protocol handler.
job_factory_.SetProtocolHandler(
- "blob", new BlobProtocolHandler(blob_storage_context_.get(),
+ "blob", new webkit_blob::BlobProtocolHandler(blob_storage_context_.get(),
file_system_context,
base::MessageLoopProxy::current()));
set_job_factory(&job_factory_);
@@ -33,7 +33,8 @@ ScopedTextBlob::ScopedTextBlob(
: blob_id_(blob_id),
context_(request_context.blob_storage_context()) {
DCHECK(context_);
- scoped_refptr<BlobData> blob_data(new BlobData(blob_id_));
+ scoped_refptr<webkit_blob::BlobData> blob_data(
+ new webkit_blob::BlobData(blob_id_));
if (!data.empty())
blob_data->AppendData(data);
handle_ = context_->AddFinishedBlob(blob_data);
@@ -42,8 +43,8 @@ ScopedTextBlob::ScopedTextBlob(
ScopedTextBlob::~ScopedTextBlob() {
}
-scoped_ptr<BlobDataHandle> ScopedTextBlob::GetBlobDataHandle() {
+scoped_ptr<webkit_blob::BlobDataHandle> ScopedTextBlob::GetBlobDataHandle() {
return context_->GetBlobDataFromUUID(blob_id_);
}
-} // namespace webkit_blob
+} // namespace content
« no previous file with comments | « content/public/test/mock_blob_url_request_context.h ('k') | webkit/browser/blob/mock_blob_url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698