Merge remote-tracking branch 'origin/upstream-master' into 63-based

Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578

1 files changed, 37 insertions, 0 deletions

diff --git a/chromium/third_party/win_build_output/midl/remoting/host/win/x86/chromoting_lib.dlldata.c b/chromium/third_party/win_build_output/midl/remoting/host/win/x86/chromoting_lib.dlldata.c
new file mode 100644
index 00000000000..62257138fca
--- /dev/null
+++ b/chromium/third_party/win_build_output/midl/remoting/host/win/x86/chromoting_lib.dlldata.c
@@ -0,0 +1,37 @@
+/*********************************************************
+   DllData file -- generated by MIDL compiler 
+
+        DO NOT ALTER THIS FILE
+
+   This file is regenerated by MIDL on every IDL file compile.
+
+   To completely reconstruct this file, delete it and rerun MIDL
+   on all the IDL files in this DLL, specifying this file for the
+   /dlldata command line option
+
+*********************************************************/
+
+
+#include <rpcproxy.h>
+
+#ifdef __cplusplus
+extern "C"   {
+#endif
+
+EXTERN_PROXY_FILE( chromoting_lib )
+
+
+PROXYFILE_LIST_START
+/* Start of list */
+  REFERENCE_PROXY_FILE( chromoting_lib ),
+/* End of list */
+PROXYFILE_LIST_END
+
+
+DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
+
+#ifdef __cplusplus
+}  /*extern "C" */
+#endif
+
+/* end of generated dlldata file */