chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/policy/affiliated_invalidation_service_provider_impl.h

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

Patch Set: rebase 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/chromeos/policy/affiliated_cloud_policy_invalidator_unittest.cc ('k') | chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h

diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h

index d69d11b636519a57f8cbeb1491f5316eb2e047f1..4bf4219388e3ed8ed103882400a904160f1d6234 100644

--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h

+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_IMPL_H_

#define CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_IMPL_H_

+#include <memory>

#include "base/macros.h"

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

#include "base/memory/scoped_vector.h"

#include "base/observer_list.h"

#include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provider.h"

@@ -70,11 +71,12 @@ class AffiliatedInvalidationServiceProviderImpl

content::NotificationRegistrar registrar_;

// Device-global invalidation service.

- scoped_ptr<invalidation::TiclInvalidationService>

+ std::unique_ptr<invalidation::TiclInvalidationService>

device_invalidation_service_;

// State observer for the device-global invalidation service.

- scoped_ptr<InvalidationServiceObserver> device_invalidation_service_observer_;

+ std::unique_ptr<InvalidationServiceObserver>

+ device_invalidation_service_observer_;

// State observers for logged-in users' invalidation services.

ScopedVector<InvalidationServiceObserver>