Rearrange dependency to enable adding finch experiment in webrtc

third_party/libjingle/BUILD.gn

Index: third_party/libjingle/BUILD.gn
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 5c462bcdcc31490715f5e2132b8fd7464fc77e56..0385b840ec80fc2ea765bb696c5a1a92c4abf6ab 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -296,13 +296,25 @@ if (enable_webrtc) {
     configs += [ ":jingle_unexported_configs" ]
     public_configs = [ ":jingle_public_configs" ]
     deps = [
-      ":libjingle_webrtc_common",
+      ":libjingle_webrtc_shared",
+    ]
+  }
+
+  source_set("libjingle_webrtc_common") {
+    system_wrappers_dir = "../webrtc/system_wrappers"
+    sources = [
+      "$system_wrappers_dir/interface/field_trial_default.h",
+      "$system_wrappers_dir/interface/field_trial.h",
+      "$system_wrappers_dir/source/field_trial_default.cc",
+    ]
+    deps = [
+      ":libjingle_webrtc_shared",
     ]
   }
 
   # Note: this does not support the shared library build of libpeerconnection
   # as is supported in the GYP build. It's not clear what this is used for.
-  source_set("libjingle_webrtc_common") {
+  source_set("libjingle_webrtc_shared") {
     sources = [
       "overrides/talk/media/webrtc/webrtcexport.h",
       "source/talk/app/webrtc/audiotrack.cc",
@@ -488,9 +500,8 @@ if (enable_webrtc) {
     deps = [
       # TODO(GYP): crbug.com/481633. Consider depending on :libjingle_webrtc
       # instead.
-      ":libjingle_webrtc_common",
+      ":libjingle_webrtc_shared",
       "//third_party/webrtc",
-      "//third_party/webrtc/system_wrappers",
       "//third_party/webrtc/voice_engine",
     ]
   }
@@ -503,7 +514,7 @@ if (enable_webrtc) {
 
     deps = [
       "//third_party/webrtc/base:rtc_base",
-      ":libjingle_webrtc_common",
+      ":libjingle_webrtc_shared",
     ]
   }
 }  # enable_webrtc