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

Side by Side Diff: content/renderer/media/mock_media_stream_registry.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 "content/renderer/media/mock_media_stream_registry.h" 5 #include "content/renderer/media/mock_media_stream_registry.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 10 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
11 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 11 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
12 #include "third_party/WebKit/public/platform/WebString.h" 12 #include "third_party/WebKit/public/platform/WebString.h"
13 #include "third_party/WebKit/public/platform/WebVector.h" 13 #include "third_party/WebKit/public/platform/WebVector.h"
14 #include "third_party/libjingle/source/talk/media/base/videocapturer.h" 14 #include "third_party/libjingle/source/talk/media/base/videocapturer.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 static const std::string kTestStreamLabel = "stream_label"; 18 static const std::string kTestStreamLabel = "stream_label";
19 19
(...skipping 25 matching lines...) Expand all
45 return WebKit::WebMediaStream(); 45 return WebKit::WebMediaStream();
46 } 46 }
47 return test_stream_; 47 return test_stream_;
48 } 48 }
49 49
50 const WebKit::WebMediaStream MockMediaStreamRegistry::test_stream() const { 50 const WebKit::WebMediaStream MockMediaStreamRegistry::test_stream() const {
51 return test_stream_; 51 return test_stream_;
52 } 52 }
53 53
54 } // namespace content 54 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698