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

Side by Side Diff: media/test/pipeline_integration_test.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « media/test/DEPS ('k') | mojo/BUILD.gn » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 22 matching lines...) Expand all
33 #include "media/filters/chunk_demuxer.h" 33 #include "media/filters/chunk_demuxer.h"
34 #include "media/renderers/renderer_impl.h" 34 #include "media/renderers/renderer_impl.h"
35 #include "media/test/pipeline_integration_test_base.h" 35 #include "media/test/pipeline_integration_test_base.h"
36 #include "testing/gmock/include/gmock/gmock.h" 36 #include "testing/gmock/include/gmock/gmock.h"
37 #include "url/gurl.h" 37 #include "url/gurl.h"
38 38
39 #if defined(MOJO_RENDERER) 39 #if defined(MOJO_RENDERER)
40 #include "media/mojo/clients/mojo_renderer.h" 40 #include "media/mojo/clients/mojo_renderer.h"
41 #include "media/mojo/interfaces/renderer.mojom.h" 41 #include "media/mojo/interfaces/renderer.mojom.h"
42 #include "media/mojo/interfaces/service_factory.mojom.h" 42 #include "media/mojo/interfaces/service_factory.mojom.h"
43 #include "services/shell/public/cpp/connect.h" 43 #include "services/service_manager/public/cpp/connect.h"
44 #include "services/shell/public/cpp/service_test.h" 44 #include "services/service_manager/public/cpp/service_test.h"
45 45
46 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way 46 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way
47 // currently to get hashes for video and audio samples. This also means that 47 // currently to get hashes for video and audio samples. This also means that
48 // real audio plays out for each test. 48 // real audio plays out for each test.
49 #define EXPECT_HASH_EQ(a, b) 49 #define EXPECT_HASH_EQ(a, b)
50 #define EXPECT_VIDEO_FORMAT_EQ(a, b) 50 #define EXPECT_VIDEO_FORMAT_EQ(a, b)
51 #define EXPECT_COLOR_SPACE_EQ(a, b) 51 #define EXPECT_COLOR_SPACE_EQ(a, b)
52 52
53 // TODO(xhwang): EME support is not complete for the mojo renderer, so all 53 // TODO(xhwang): EME support is not complete for the mojo renderer, so all
54 // encrypted tests are currently disabled. 54 // encrypted tests are currently disabled.
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after
2477 2477
2478 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2478 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2479 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2479 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2480 Play(); 2480 Play();
2481 ASSERT_TRUE(WaitUntilOnEnded()); 2481 ASSERT_TRUE(WaitUntilOnEnded());
2482 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2482 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2483 demuxer_->GetStartTime()); 2483 demuxer_->GetStartTime());
2484 } 2484 }
2485 2485
2486 } // namespace media 2486 } // namespace media
OLDNEW
« no previous file with comments | « media/test/DEPS ('k') | mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698