Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: components/invalidation/impl/mock_ack_handler.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/invalidation/impl/mock_ack_handler.h" 5 #include "components/invalidation/impl/mock_ack_handler.h"
6 6
7 #include <algorithm>
8
7 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
8 #include "components/invalidation/public/ack_handle.h" 10 #include "components/invalidation/public/ack_handle.h"
9 #include "components/invalidation/public/invalidation.h" 11 #include "components/invalidation/public/invalidation.h"
10 12
11 namespace syncer { 13 namespace syncer {
12 14
13 namespace { 15 namespace {
14 16
15 struct AckHandleMatcher { 17 struct AckHandleMatcher {
16 AckHandleMatcher(const AckHandle& handle); 18 AckHandleMatcher(const AckHandle& handle);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 matcher); 113 matcher);
112 if (it != unacked_invalidations_.end()) { 114 if (it != unacked_invalidations_.end()) {
113 dropped_invalidations_.push_back(*it); 115 dropped_invalidations_.push_back(*it);
114 unacked_invalidations_.erase(it); 116 unacked_invalidations_.erase(it);
115 } 117 }
116 unrecovered_drop_events_.erase(id); 118 unrecovered_drop_events_.erase(id);
117 unrecovered_drop_events_.insert(std::make_pair(id, handle)); 119 unrecovered_drop_events_.insert(std::make_pair(id, handle));
118 } 120 }
119 121
120 } // namespace syncer 122 } // namespace syncer
OLDNEW
« no previous file with comments | « components/gcm_driver/fake_gcm_client.cc ('k') | components/memory_pressure/filtered_memory_pressure_calculator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698