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

Side by Side Diff: content/renderer/media/video_source_handler_unittest.cc

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <string> 5 #include <string>
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/renderer/media/media_stream_extra_data.h" 8 #include "content/renderer/media/media_stream_extra_data.h"
9 #include "content/renderer/media/media_stream_registry_interface.h" 9 #include "content/renderer/media/media_stream_registry_interface.h"
10 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 10 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
11 #include "content/renderer/media/mock_media_stream_registry.h" 11 #include "content/renderer/media/mock_media_stream_registry.h"
12 #include "content/renderer/media/video_source_handler.h" 12 #include "content/renderer/media/video_source_handler.h"
13 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
16 #include "third_party/WebKit/public/platform/WebString.h" 16 #include "third_party/WebKit/public/platform/WebString.h"
17 #include "third_party/libjingle/source/talk/media/base/videorenderer.h" 17 #include "third_party/libjingle/source/talk/media/base/videorenderer.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 EXPECT_EQ(test_frame.GetTimeStamp(), frame->GetTimeStamp()); 80 EXPECT_EQ(test_frame.GetTimeStamp(), frame->GetTimeStamp());
81 EXPECT_EQ(test_frame.GetYPlane(), frame->GetYPlane()); 81 EXPECT_EQ(test_frame.GetYPlane(), frame->GetYPlane());
82 EXPECT_EQ(test_frame.GetUPlane(), frame->GetUPlane()); 82 EXPECT_EQ(test_frame.GetUPlane(), frame->GetUPlane());
83 EXPECT_EQ(test_frame.GetVPlane(), frame->GetVPlane()); 83 EXPECT_EQ(test_frame.GetVPlane(), frame->GetVPlane());
84 84
85 EXPECT_TRUE(handler_->Close(kTestStreamUrl, &reader)); 85 EXPECT_TRUE(handler_->Close(kTestStreamUrl, &reader));
86 EXPECT_TRUE(handler_->GetReceiver(&reader) == NULL); 86 EXPECT_TRUE(handler_->GetReceiver(&reader) == NULL);
87 } 87 }
88 88
89 } // namespace content 89 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698