chrome/browser/sync_file_system/local/canned_syncable_file_system.h - Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr

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.h

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h ('k') | chrome/browser/sync_file_system/local/canned_syncable_file_system.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/local/canned_syncable_file_system.h

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

index 4d42e5061dde476e89385b609165503446619363..2f14160d1322d34ea3f13e17e8a80a05f2a15983 100644

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

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

@@ -7,6 +7,7 @@

#include <stdint.h>

+#include <memory>

#include <string>

#include <vector>

@@ -14,7 +15,6 @@

#include "base/files/file.h"

#include "base/files/scoped_temp_dir.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/observer_list_threadsafe.h"

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

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

@@ -145,7 +145,7 @@ class CannedSyncableFileSystem

// Returns the # of bytes written (>=0) or an error code (<0).

int64_t Write(net::URLRequestContext* url_request_context,

const storage::FileSystemURL& url,

- scoped_ptr<storage::BlobDataHandle> blob_data_handle);

+ std::unique_ptr<storage::BlobDataHandle> blob_data_handle);

int64_t WriteString(const storage::FileSystemURL& url,

const std::string& data);

@@ -207,7 +207,7 @@ class CannedSyncableFileSystem

const StatusCallback& callback);

void DoWrite(net::URLRequestContext* url_request_context,

const storage::FileSystemURL& url,

- scoped_ptr<storage::BlobDataHandle> blob_data_handle,

+ std::unique_ptr<storage::BlobDataHandle> blob_data_handle,

const WriteCallback& callback);

void DoWriteString(const storage::FileSystemURL& url,

const std::string& data,