components/gcm_driver/instance_id/instance_id_driver.h - Issue 1096983002: Update usages of std::map to use ScopedPtrMap.

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: components/gcm_driver/instance_id/instance_id_driver.h

Issue 1096983002: Update usages of std::map to use ScopedPtrMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@passwordmanager-scopedmemory

Patch Set: Fix Mac compile. Created 5 years, 6 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

« chromeos/dbus/gsm_sms_client.cc ('K') | « components/gcm_driver/instance_id/instance_id_android.cc ('k') | components/gcm_driver/instance_id/instance_id_driver.cc » ('j') | ui/gfx/image/image.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/gcm_driver/instance_id/instance_id_driver.h

diff --git a/components/gcm_driver/instance_id/instance_id_driver.h b/components/gcm_driver/instance_id/instance_id_driver.h

index 4bb9fd736155a019ac9911652c4ffbbaf0ef8f37..8d5b5f16350011debb9e99858e2ccaf101a789ce 100644

--- a/components/gcm_driver/instance_id/instance_id_driver.h

+++ b/components/gcm_driver/instance_id/instance_id_driver.h

@@ -5,11 +5,11 @@

#ifndef COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_DRIVER_H_

#define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_DRIVER_H_

-#include <map>

#include <string>

+#include "base/containers/scoped_ptr_map.h"

#include "base/macros.h"

-#include "base/stl_util.h"

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

namespace gcm {

class GCMDriver;

@@ -43,9 +43,7 @@ class InstanceIDDriver {

private:

gcm::GCMDriver* gcm_driver_; // Not owned.

- typedef std::map<std::string, InstanceID*> InstanceIDMap;

- InstanceIDMap instance_id_map_;

- STLValueDeleter<InstanceIDMap> instance_id_map_deleter_;

+ ScopedPtrMap<std::string, scoped_ptr<InstanceID>> instance_id_map_;

DISALLOW_COPY_AND_ASSIGN(InstanceIDDriver);

};