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

Side by Side Diff: media/mojo/services/renderer_unittest.cc

Issue 661163004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « media/midi/midi_manager_usb_unittest.cc ('k') | media/tools/player_x11/data_source_logger.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 }; 101 };
102 102
103 } // namespace 103 } // namespace
104 104
105 namespace media { 105 namespace media {
106 106
107 class MojoRendererTest : public testing::Test { 107 class MojoRendererTest : public testing::Test {
108 public: 108 public:
109 MojoRendererTest() : service_provider_(NULL) {} 109 MojoRendererTest() : service_provider_(NULL) {}
110 110
111 virtual void SetUp() override { 111 void SetUp() override {
112 demuxer_stream_provider_.reset(new FakeDemuxerStream()); 112 demuxer_stream_provider_.reset(new FakeDemuxerStream());
113 service_provider_ = 113 service_provider_ =
114 g_test_delegate->application_impl() 114 g_test_delegate->application_impl()
115 ->ConnectToApplication("mojo:media_mojo_renderer_app") 115 ->ConnectToApplication("mojo:media_mojo_renderer_app")
116 ->GetServiceProvider(); 116 ->GetServiceProvider();
117 } 117 }
118 118
119 mojo::ServiceProvider* service_provider() { return service_provider_; } 119 mojo::ServiceProvider* service_provider() { return service_provider_; }
120 DemuxerStreamProvider* stream_provider() { 120 DemuxerStreamProvider* stream_provider() {
121 return demuxer_stream_provider_.get(); 121 return demuxer_stream_provider_.get();
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 int argc = 0; 175 int argc = 0;
176 char** argv = NULL; 176 char** argv = NULL;
177 testing::InitGoogleTest(&argc, argv); 177 testing::InitGoogleTest(&argc, argv);
178 mojo_ignore_result(RUN_ALL_TESTS()); 178 mojo_ignore_result(RUN_ALL_TESTS());
179 } 179 }
180 180
181 g_test_delegate = NULL; 181 g_test_delegate = NULL;
182 delegate.reset(); 182 delegate.reset();
183 return MOJO_RESULT_OK; 183 return MOJO_RESULT_OK;
184 } 184 }
OLDNEW
« no previous file with comments | « media/midi/midi_manager_usb_unittest.cc ('k') | media/tools/player_x11/data_source_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698