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

Side by Side Diff: talk/app/webrtc/statscollector_unittest.cc

Issue 1377733004: Convert uint16_t to int for WebRTC cipher/crypto suite (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 using testing::Field; 54 using testing::Field;
55 using testing::Return; 55 using testing::Return;
56 using testing::ReturnNull; 56 using testing::ReturnNull;
57 using testing::SetArgPointee; 57 using testing::SetArgPointee;
58 using webrtc::PeerConnectionInterface; 58 using webrtc::PeerConnectionInterface;
59 using webrtc::StatsReport; 59 using webrtc::StatsReport;
60 using webrtc::StatsReports; 60 using webrtc::StatsReports;
61 61
62 namespace { 62 namespace {
63 // This value comes from openssl/tls1.h 63 // This value comes from openssl/tls1.h
64 const uint16_t TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014; 64 const int TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014;
65 } // namespace 65 } // namespace
66 66
67 namespace cricket { 67 namespace cricket {
68 68
69 class ChannelManager; 69 class ChannelManager;
70 70
71 } // namespace cricket 71 } // namespace cricket
72 72
73 namespace webrtc { 73 namespace webrtc {
74 74
(...skipping 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 cricket::VoiceSenderInfo new_voice_sender_info; 1732 cricket::VoiceSenderInfo new_voice_sender_info;
1733 InitVoiceSenderInfo(&new_voice_sender_info); 1733 InitVoiceSenderInfo(&new_voice_sender_info);
1734 cricket::VoiceMediaInfo new_stats_read; 1734 cricket::VoiceMediaInfo new_stats_read;
1735 reports.clear(); 1735 reports.clear();
1736 SetupAndVerifyAudioTrackStats( 1736 SetupAndVerifyAudioTrackStats(
1737 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, 1737 new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName,
1738 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); 1738 media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports);
1739 } 1739 }
1740 1740
1741 } // namespace webrtc 1741 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698