chrome/utility/importer/edge_database_reader_win.h - Issue 1899083002: Convert //chrome 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/utility/importer/edge_database_reader_win.h

Issue 1899083002: Convert //chrome 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

« chrome/tools/service_discovery_sniffer/service_discovery_sniffer.h ('K') | « chrome/utility/importer/edge_database_reader_unittest_win.cc ('k') | chrome/utility/importer/edge_database_reader_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/utility/importer/edge_database_reader_win.h

diff --git a/chrome/utility/importer/edge_database_reader_win.h b/chrome/utility/importer/edge_database_reader_win.h

index 1b87801358b637fef6d2d99cf59adacf261d6bb9..5f0e2ff8ef98255c1211abe5e676b5ca76700881 100644

--- a/chrome/utility/importer/edge_database_reader_win.h

+++ b/chrome/utility/importer/edge_database_reader_win.h

@@ -7,12 +7,13 @@

#define JET_UNICODE

#include <esent.h>

+#include <memory>

Lei Zhang 2016/04/19 01:35:43 Move this down to after line 14.

dcheng 2016/04/19 03:51:33 Done.

#undef JET_UNICODE

#include <map>

#include "base/macros.h"

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

#include "base/strings/string16.h"

class EdgeErrorObject {

@@ -79,7 +80,7 @@ class EdgeDatabaseReader : public EdgeErrorObject {

bool OpenDatabase(const base::string16& database_file);

// Open a row enumerator for a specified table. Returns a nullptr on error.

- scoped_ptr<EdgeDatabaseTableEnumerator> OpenTableEnumerator(

+ std::unique_ptr<EdgeDatabaseTableEnumerator> OpenTableEnumerator(

const base::string16& table_name);

private: