chrome/browser/safe_browsing/client_side_model_loader.cc - 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_model_loader.cc

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_model_loader.h ('k') | chrome/browser/safe_browsing/client_side_model_loader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/client_side_model_loader.cc

diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc

index 81a2d876eccde26cf702b0b64ce6a8ce8e318c57..f17dd566521990f466d01175631d199bc26d939d 100644

--- a/chrome/browser/safe_browsing/client_side_model_loader.cc

+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc

@@ -4,9 +4,10 @@

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

+#include <memory>

#include "base/bind.h"

#include "base/command_line.h"

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

#include "base/message_loop/message_loop.h"

#include "base/metrics/histogram.h"

#include "base/strings/string_number_conversions.h"

@@ -136,7 +137,7 @@ void ModelLoader::OnURLFetchComplete(const net::URLFetcher* source) {

source->GetResponseHeaders()) {

source->GetResponseHeaders()->GetMaxAgeValue(&max_age);

}

- scoped_ptr<ClientSideModel> model(new ClientSideModel());

+ std::unique_ptr<ClientSideModel> model(new ClientSideModel());

ClientModelStatus model_status;

if (!is_success || net::HTTP_OK != response_code) {

model_status = MODEL_FETCH_FAILED;