| Index: chrome/browser/extensions/api/audio_modem/audio_modem_api.h
|
| diff --git a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h
|
| index e5f0776c6d114a85df5342db6f5352fed9045d53..557e606e51d3e7951db3b5499fe16a769e3eb5aa 100644
|
| --- a/chrome/browser/extensions/api/audio_modem/audio_modem_api.h
|
| +++ b/chrome/browser/extensions/api/audio_modem/audio_modem_api.h
|
| @@ -6,11 +6,11 @@
|
| #define CHROME_BROWSER_EXTENSIONS_API_AUDIO_MODEM_AUDIO_MODEM_API_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/common/extensions/api/audio_modem.h"
|
| #include "components/audio_modem/public/modem.h"
|
| #include "extensions/browser/browser_context_keyed_api_factory.h"
|
| @@ -26,9 +26,10 @@ class AudioModemAPI final : public BrowserContextKeyedAPI {
|
| explicit AudioModemAPI(content::BrowserContext* context);
|
|
|
| // Testing constructor: pass in dependencies.
|
| - AudioModemAPI(content::BrowserContext* context,
|
| - scoped_ptr<audio_modem::WhispernetClient> whispernet_client,
|
| - scoped_ptr<audio_modem::Modem> modem);
|
| + AudioModemAPI(
|
| + content::BrowserContext* context,
|
| + std::unique_ptr<audio_modem::WhispernetClient> whispernet_client,
|
| + std::unique_ptr<audio_modem::Modem> modem);
|
|
|
| ~AudioModemAPI() override;
|
|
|
| @@ -66,8 +67,8 @@ class AudioModemAPI final : public BrowserContextKeyedAPI {
|
| void TokensReceived(const std::vector<audio_modem::AudioToken>& tokens);
|
|
|
| content::BrowserContext* const browser_context_;
|
| - scoped_ptr<audio_modem::WhispernetClient> whispernet_client_;
|
| - scoped_ptr<audio_modem::Modem> modem_;
|
| + std::unique_ptr<audio_modem::WhispernetClient> whispernet_client_;
|
| + std::unique_ptr<audio_modem::Modem> modem_;
|
| bool init_failed_;
|
|
|
| // IDs for the currently transmitting app (if any), indexed by AudioType.
|
|
|