Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at da7c539c377367da25fc913d4399c5f0f69764ad

This commit was generated by merge_from_chromium.py.

Change-Id: Ieab52294a0a33f311c9f61dad4f7ab932a7280d5

1 files changed, 22 insertions, 0 deletions

diff --git a/system_wrappers/source/field_trial_default.cc b/system_wrappers/source/field_trial_default.cc
new file mode 100644
index 00000000..892623ce
--- /dev/null
+++ b/system_wrappers/source/field_trial_default.cc
@@ -0,0 +1,22 @@
+// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+
+#include "webrtc/system_wrappers/interface/field_trial.h"
+
+// Clients of webrtc that do not want to configure field trials can link with
+// this instead of providing their own implementation.
+namespace webrtc {
+namespace field_trial {
+
+std::string FindFullName(const std::string& name) {
+  return std::string();
+}
+
+}  // namespace field_trial
+}  // namespace webrtc