chrome/browser/importer/ie_importer_browsertest_win.cc - Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant.

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/importer/ie_importer_browsertest_win.cc

Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scoped-operator: ptr() Created 5 years, 9 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 | « base/win/scoped_variant_unittest.cc ('k') | chrome/browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/importer/ie_importer_browsertest_win.cc

diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc

index 96ac211f8f77ec67da87f19233b2bfa6fa4a642d..a99c5b5105902f915e17172cd1e940c9f329b51d 100644

--- a/chrome/browser/importer/ie_importer_browsertest_win.cc

+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc

@@ -194,7 +194,8 @@ bool CreateUrlFileWithFavicon(const base::FilePath& file,

base::win::ScopedPropVariant pv_icon;

if (FAILED(InitPropVariantFromString(favicon_url.c_str(),

pv_icon.Receive())) ||

- FAILED(property_storage->WriteMultiple(1, properties, &pv_icon, 0))) {

+ FAILED(property_storage->WriteMultiple(1, properties, &pv_icon.get(),

Nico 2015/03/09 21:11:32 just pv_icon.get(), no &, no?

danakj 2015/03/09 21:44:36 Added a ptr() to ScopedPropVariant to match Scoped

+ 0))) {

return false;

}