content/renderer/media/media_stream_impl_unittest.cc - Issue 16408017: Use a direct include of utf_string_conversions.h in content/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/media_stream_impl_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

« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/mock_media_stream_dependency_factory.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/memory/scoped_ptr.h"	5 #include "base/memory/scoped_ptr.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "content/renderer/media/media_stream_extra_data.h"	7 #include "content/renderer/media/media_stream_extra_data.h"

8 #include "content/renderer/media/media_stream_impl.h"	8 #include "content/renderer/media/media_stream_impl.h"

9 #include "content/renderer/media/mock_media_stream_dependency_factory.h"	9 #include "content/renderer/media/mock_media_stream_dependency_factory.h"

10 #include "content/renderer/media/mock_media_stream_dispatcher.h"	10 #include "content/renderer/media/mock_media_stream_dispatcher.h"

11 #include "content/renderer/media/video_capture_impl_manager.h"	11 #include "content/renderer/media/video_capture_impl_manager.h"

12 #include "testing/gtest/include/gtest/gtest.h"	12 #include "testing/gtest/include/gtest/gtest.h"

13 #include "third_party/WebKit/public/platform/WebMediaStream.h"	13 #include "third_party/WebKit/public/platform/WebMediaStream.h"

14 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"	14 #include "third_party/WebKit/public/platform/WebMediaStreamSource.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"

(...skipping 213 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);	230 WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);

231 EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());	231 EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());

232 EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());	232 EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());

233 ms_impl_->FrameWillClose(NULL);	233 ms_impl_->FrameWillClose(NULL);

234 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());	234 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());

235 ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());	235 ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());

236 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());	236 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());

237 }	237 }

238	238

239 } // namespace content	239 } // namespace content

OLD	NEW