Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..."

content/public/common/content_switches.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/content_switches.h"
 
 namespace switches {
 
 // By default, file:// URIs cannot read other file:// URIs. This is an
 // override for developers who need the old behavior for testing.
@@ skipping 855 matching lines @@
 
 // Enable WebRTC DataChannels SCTP wire protocol support.
 const char kEnableSCTPDataChannels[]        = "enable-sctp-data-channels";
 
 // Enables WebRTC AEC recordings.
 const char kEnableWebRtcAecRecordings[]     = "enable-webrtc-aec-recordings";
 
 // Enables HW decode acceleration for WebRTC.
 const char kEnableWebRtcHWDecoding[]        = "enable-webrtc-hw-decoding";
 
+// Enables HW encode acceleration for WebRTC.
+const char kEnableWebRtcHWEncoding[] = "enable-webrtc-hw-encoding";
+
 #endif
 
 #if defined(OS_ANDROID)
 // Disables device motion events.
 const char kDisableDeviceMotion[]           = "disable-device-motion";
 
 // Disable user gesture requirement for media playback.
 const char kDisableGestureRequirementForMediaPlayback[] =
     "disable-gesture-requirement-for-media-playback";
 
@@ skipping 46 matching lines @@
 // Forces usage of the test compositor. Needed to run ui tests on bots.
 extern const char kTestCompositor[]         = "test-compositor";
 #endif
 
 // Don't dump stuff here, follow the same order as the header.
 
 // Allows filters (SkImageFilter objects) to be sent between processes over IPC
 const char kAllowFiltersOverIPC[] = "allow-filters-over-ipc";
 
 }  // namespace switches