chrome/browser/safe_browsing/client_side_detection_service.h - Issue 1870003002: Convert //chrome/browser/safe_browsing 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/browser/safe_browsing/client_side_detection_service.h

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and address comments 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 | « chrome/browser/safe_browsing/client_side_detection_host_unittest.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/client_side_detection_service.h

diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h

index 1e168a6f5bc31627ed89d45f23dd2e10ca52f767..09916028009a9e44d431759719897ebc1aafead4 100644

--- a/chrome/browser/safe_browsing/client_side_detection_service.h

+++ b/chrome/browser/safe_browsing/client_side_detection_service.h

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

#define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_SERVICE_H_

#include <map>

+#include <memory>

#include <queue>

#include <set>

#include <string>

@@ -25,7 +26,6 @@

#include "base/macros.h"

#include "base/memory/linked_ptr.h"

#include "base/memory/ref_counted.h"

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

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

#include "chrome/browser/safe_browsing/client_side_model_loader.h"

@@ -228,8 +228,8 @@ class ClientSideDetectionService : public net::URLFetcherDelegate,

// We load two models: One for stadard Safe Browsing profiles,

// and one for those opted into extended reporting.

- scoped_ptr<ModelLoader> model_loader_standard_;

- scoped_ptr<ModelLoader> model_loader_extended_;

+ std::unique_ptr<ModelLoader> model_loader_standard_;

+ std::unique_ptr<ModelLoader> model_loader_extended_;

// Map of client report phishing request to the corresponding callback that

// has to be invoked when the request is done.