content/browser/dom_storage/dom_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/dom_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/dom_storage_context_wrapper.cc ('k') | content/browser/dom_storage/dom_storage_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/dom_storage/dom_storage_database.h

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

index 72f5d7373723535f9c7ee67cbe4305ca3f29ae49..75416374edee676e1a5ce2f7e27a52edd709df1f 100644

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

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

@@ -6,10 +6,10 @@

#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_DATABASE_H_

#include <map>

+#include <memory>

#include "base/files/file_path.h"

#include "base/gtest_prod_util.h"

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

#include "base/strings/nullable_string16.h"

#include "base/strings/string16.h"

#include "content/common/content_export.h"

@@ -108,7 +108,7 @@ class CONTENT_EXPORT DOMStorageDatabase {

// Path to the database on disk.

const base::FilePath file_path_;

- scoped_ptr<sql::Connection> db_;

+ std::unique_ptr<sql::Connection> db_;

bool failed_to_open_;

bool tried_to_recreate_;

bool known_to_be_empty_;