| OLD | NEW | 
|   1 // Copyright 2014 The Chromium Authors. All rights reserved. |   1 // Copyright 2014 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/command_line.h" |   5 #include "base/command_line.h" | 
|   6 #include "chrome/browser/media/webrtc_browsertest_base.h" |   6 #include "chrome/browser/media/webrtc_browsertest_base.h" | 
|   7 #include "chrome/browser/media/webrtc_browsertest_common.h" |   7 #include "chrome/browser/media/webrtc_browsertest_common.h" | 
|   8 #include "chrome/common/chrome_version_info.h" |   8 #include "chrome/common/chrome_version_info.h" | 
|   9 #include "content/public/common/content_switches.h" |   9 #include "content/public/common/content_switches.h" | 
|  10 #include "media/base/media_switches.h" |  10 #include "media/base/media_switches.h" | 
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  65  |  65  | 
|  66   NegotiateCall(left_tab, right_tab); |  66   NegotiateCall(left_tab, right_tab); | 
|  67  |  67  | 
|  68   StartDetectingVideo(left_tab, "remote-view"); |  68   StartDetectingVideo(left_tab, "remote-view"); | 
|  69   StartDetectingVideo(right_tab, "remote-view"); |  69   StartDetectingVideo(right_tab, "remote-view"); | 
|  70  |  70  | 
|  71   WaitForVideoToPlay(left_tab); |  71   WaitForVideoToPlay(left_tab); | 
|  72   WaitForVideoToPlay(right_tab); |  72   WaitForVideoToPlay(right_tab); | 
|  73  |  73  | 
|  74   bool should_detect_encryption = true; |  74   bool should_detect_encryption = true; | 
|  75   VersionInfo::Channel channel = VersionInfo::GetChannel(); |  75   version_info::Channel channel = VersionInfo::GetChannel(); | 
|  76   if (channel == VersionInfo::CHANNEL_UNKNOWN || |  76   if (channel == version_info::Channel::UNKNOWN || | 
|  77       channel == VersionInfo::CHANNEL_CANARY || |  77       channel == version_info::Channel::CANARY || | 
|  78       channel == VersionInfo::CHANNEL_DEV) { |  78       channel == version_info::Channel::DEV) { | 
|  79     should_detect_encryption = false; |  79     should_detect_encryption = false; | 
|  80   } |  80   } | 
|  81 #if defined(OS_ANDROID) |  81 #if defined(OS_ANDROID) | 
|  82   if (channel == VersionInfo::CHANNEL_BETA) |  82   if (channel == version_info::Channel::BETA) | 
|  83     should_detect_encryption = false; |  83     should_detect_encryption = false; | 
|  84 #endif |  84 #endif | 
|  85  |  85  | 
|  86   std::string expected_string = should_detect_encryption ? |  86   std::string expected_string = should_detect_encryption ? | 
|  87     "crypto-seen" : "no-crypto-seen"; |  87     "crypto-seen" : "no-crypto-seen"; | 
|  88  |  88  | 
|  89   ASSERT_EQ(expected_string, |  89   ASSERT_EQ(expected_string, | 
|  90             ExecuteJavascript("hasSeenCryptoInSdp()", left_tab)); |  90             ExecuteJavascript("hasSeenCryptoInSdp()", left_tab)); | 
|  91  |  91  | 
|  92   HangUp(left_tab); |  92   HangUp(left_tab); | 
|  93   HangUp(right_tab); |  93   HangUp(right_tab); | 
|  94 } |  94 } | 
| OLD | NEW |