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

Unified Diff: extensions/browser/api/cast_channel/logger.h

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: extensions/browser/api/cast_channel/logger.h
diff --git a/extensions/browser/api/cast_channel/logger.h b/extensions/browser/api/cast_channel/logger.h
index 90c32ebf955d8875fe100c7bbc6172786035a982..c9c696aa3a470ec0f1c9508510420179b2fe79dd 100644
--- a/extensions/browser/api/cast_channel/logger.h
+++ b/extensions/browser/api/cast_channel/logger.h
@@ -9,12 +9,12 @@
#include <deque>
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "extensions/browser/api/cast_channel/logger_util.h"
#include "extensions/common/api/cast_channel/logging.pb.h"
@@ -45,7 +45,7 @@ class Logger : public base::RefCounted<Logger> {
//
// See crbug.com/518951 for information on why base::Clock
// is used instead of base::TickClock.
- Logger(scoped_ptr<base::Clock> clock, base::Time unix_epoch_time);
+ Logger(std::unique_ptr<base::Clock> clock, base::Time unix_epoch_time);
// For newly created sockets. Will create an event and log a
// CAST_SOCKET_CREATED event.
@@ -81,7 +81,7 @@ class Logger : public base::RefCounted<Logger> {
// compressed in gzip format.
// If serialization or compression failed, returns nullptr.
// |length|: If successful, assigned with size of compressed content.
- scoped_ptr<char[]> GetLogs(size_t* length) const;
+ std::unique_ptr<char[]> GetLogs(size_t* length) const;
// Clears the internal map.
void Reset();
@@ -129,7 +129,7 @@ class Logger : public base::RefCounted<Logger> {
int channel_id,
const proto::SocketEvent& socket_event);
- scoped_ptr<base::Clock> clock_;
+ std::unique_ptr<base::Clock> clock_;
AggregatedSocketEventLogMap aggregated_socket_events_;
base::Time unix_epoch_time_;
« no previous file with comments | « extensions/browser/api/cast_channel/keep_alive_delegate_unittest.cc ('k') | extensions/browser/api/cast_channel/logger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698