chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc - Issue 1579863003: Convert Pass()→std::move() for Mac build.

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/media_galleries/fileapi/picasa_data_provider_browsertest.cc

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc ('k') | chrome/browser/media_galleries/fileapi/picasa_file_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

diff --git a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

index d8187e43a831ecca484a130c5b1216ada2cd1292..c869bcf487a4d9ed97ea544c087bc1a8981abdff 100644

--- a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

+++ b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

@@ -2,6 +2,9 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"

+#include <utility>

#include <vector>

#include "base/files/file_enumerator.h"

@@ -14,7 +17,6 @@

#include "base/run_loop.h"

#include "build/build_config.h"

#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"

-#include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"

#include "chrome/common/media_galleries/picasa_test_util.h"

#include "chrome/common/media_galleries/picasa_types.h"

#include "chrome/test/base/in_process_browser_test.h"

@@ -156,7 +158,7 @@ class TestPicasaDataProvider : public PicasaDataProvider {

private:

void OnTempDirWatchStarted(

scoped_ptr<base::FilePathWatcher> temp_dir_watcher) override {

- PicasaDataProvider::OnTempDirWatchStarted(temp_dir_watcher.Pass());

+ PicasaDataProvider::OnTempDirWatchStarted(std::move(temp_dir_watcher));

file_watch_request_returned_ = true;

for (std::vector<ReadyCallback>::const_iterator it =