| Index: chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| index 7992547d225d51032638e60213da5d8ba9610bc6..a33835120cced1d4d91c66f453705c1cb3419373 100644
|
| --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc
|
| @@ -5,8 +5,8 @@
|
| #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/json/json_writer.h"
|
| #include "base/values.h"
|
| @@ -197,34 +197,34 @@ void TtsExtensionEngine::Speak(Utterance* utterance,
|
|
|
| scoped_ptr<extensions::Event> event(
|
| new extensions::Event(extensions::events::TTS_ENGINE_ON_SPEAK,
|
| - tts_engine_events::kOnSpeak, args.Pass()));
|
| + tts_engine_events::kOnSpeak, std::move(args)));
|
| Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
|
| event->restrict_to_browser_context = profile;
|
| EventRouter::Get(profile)
|
| - ->DispatchEventToExtension(utterance->extension_id(), event.Pass());
|
| + ->DispatchEventToExtension(utterance->extension_id(), std::move(event));
|
| }
|
|
|
| void TtsExtensionEngine::Stop(Utterance* utterance) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| scoped_ptr<extensions::Event> event(
|
| new extensions::Event(extensions::events::TTS_ENGINE_ON_STOP,
|
| - tts_engine_events::kOnStop, args.Pass()));
|
| + tts_engine_events::kOnStop, std::move(args)));
|
| Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
|
| event->restrict_to_browser_context = profile;
|
| EventRouter::Get(profile)
|
| - ->DispatchEventToExtension(utterance->extension_id(), event.Pass());
|
| + ->DispatchEventToExtension(utterance->extension_id(), std::move(event));
|
| }
|
|
|
| void TtsExtensionEngine::Pause(Utterance* utterance) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| scoped_ptr<extensions::Event> event(
|
| new extensions::Event(extensions::events::TTS_ENGINE_ON_PAUSE,
|
| - tts_engine_events::kOnPause, args.Pass()));
|
| + tts_engine_events::kOnPause, std::move(args)));
|
| Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
|
| event->restrict_to_browser_context = profile;
|
| EventRouter* event_router = EventRouter::Get(profile);
|
| std::string id = utterance->extension_id();
|
| - event_router->DispatchEventToExtension(id, event.Pass());
|
| + event_router->DispatchEventToExtension(id, std::move(event));
|
| WarnIfMissingPauseOrResumeListener(profile, event_router, id);
|
| }
|
|
|
| @@ -232,12 +232,12 @@ void TtsExtensionEngine::Resume(Utterance* utterance) {
|
| scoped_ptr<base::ListValue> args(new base::ListValue());
|
| scoped_ptr<extensions::Event> event(
|
| new extensions::Event(extensions::events::TTS_ENGINE_ON_RESUME,
|
| - tts_engine_events::kOnResume, args.Pass()));
|
| + tts_engine_events::kOnResume, std::move(args)));
|
| Profile* profile = Profile::FromBrowserContext(utterance->browser_context());
|
| event->restrict_to_browser_context = profile;
|
| EventRouter* event_router = EventRouter::Get(profile);
|
| std::string id = utterance->extension_id();
|
| - event_router->DispatchEventToExtension(id, event.Pass());
|
| + event_router->DispatchEventToExtension(id, std::move(event));
|
| WarnIfMissingPauseOrResumeListener(profile, event_router, id);
|
| }
|
|
|
|
|