chrome/browser/sync_file_system/local/canned_syncable_file_system.cc - Issue 146963006: Move blob/mock_blob_url_request_context to content/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/local/canned_syncable_file_system.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: chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

index 12e9470d330cec4f9679d5b05f6cac067b87fa0d..6f3e4c206a72a5bf2b5278b19d76b0bd2c906f0f 100644

--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc

@@ -21,9 +21,9 @@

#include "chrome/browser/sync_file_system/local/local_file_sync_context.h"

#include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

#include "chrome/browser/sync_file_system/syncable_file_system_util.h"

+#include "content/public/test/mock_blob_url_request_context.h"

#include "content/public/test/test_file_system_options.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "webkit/browser/blob/mock_blob_url_request_context.h"

#include "webkit/browser/fileapi/external_mount_points.h"

#include "webkit/browser/fileapi/file_system_backend.h"

#include "webkit/browser/fileapi/file_system_context.h"

@@ -39,8 +39,8 @@ using fileapi::FileSystemOperationRunner;

using fileapi::FileSystemURL;

using fileapi::FileSystemURLSet;

using quota::QuotaManager;

-using webkit_blob::MockBlobURLRequestContext;

-using webkit_blob::ScopedTextBlob;

+using content::MockBlobURLRequestContext;

+using content::ScopedTextBlob;

namespace sync_file_system {

« no previous file with comments | « no previous file | chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc » ('j') | no next file with comments »