content/browser/dom_storage/session_storage_database.h - Issue 1874893002: Convert //content/browser 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: content/browser/dom_storage/session_storage_database.h

Issue 1874893002: Convert //content/browser 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 | « content/browser/dom_storage/local_storage_database_adapter.h ('k') | content/browser/dom_storage/session_storage_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/dom_storage/session_storage_database.h

diff --git a/content/browser/dom_storage/session_storage_database.h b/content/browser/dom_storage/session_storage_database.h

index d4e80e4353eda2fe4230865798f5e821db83f693..7ca2da71846f9198c9f80912e899151fdfafa417 100644

--- a/content/browser/dom_storage/session_storage_database.h

+++ b/content/browser/dom_storage/session_storage_database.h

@@ -8,12 +8,12 @@

#include <stdint.h>

#include <map>

+#include <memory>

#include <string>

#include "base/files/file_path.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

#include "base/synchronization/lock.h"

#include "content/common/content_export.h"

#include "content/common/dom_storage/dom_storage_types.h"

@@ -191,7 +191,7 @@ class CONTENT_EXPORT SessionStorageDatabase :

static std::string MapKey(const std::string& map_id, const std::string& key);

static const char* NextMapIdKey();

- scoped_ptr<leveldb::DB> db_;

+ std::unique_ptr<leveldb::DB> db_;

base::FilePath file_path_;

// For protecting the database opening code. Also guards the variables below.