SVN changes up to revision 261075

Denger-Network · Apr 2, 2014 · fee4cc1 · fee4cc1
2 parents 16578a8 + 45f4c4a
commit fee4cc1
Show file tree

Hide file tree

Showing 115 changed files with 122 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -106,14 +106,14 @@
 	path = third_party/chromite
 	url = https://chromium.googlesource.com/chromiumos/chromite.git
 	os = unix
+[submodule "third_party/clang_format/script"]
+	path = third_party/clang_format/script
+	url = https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git
+	os = all
 [submodule "third_party/cld_2/src"]
 	path = third_party/cld_2/src
 	url = https://chromium.googlesource.com/external/cld2.git
 	os = all
-[submodule "third_party/cros_dbus_cplusplus/source"]
-	path = third_party/cros_dbus_cplusplus/source
-	url = https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus.git
-	os = unix
 [submodule "third_party/cros_system_api"]
 	path = third_party/cros_system_api
 	url = https://chromium.googlesource.com/chromiumos/platform/system_api.git
@@ -216,11 +216,11 @@
 	os = all
 [submodule "third_party/libc++/trunk"]
 	path = third_party/libc++/trunk
-	url = https://llvm.googlesource.com/libcxx.git
+	url = https://chromium.googlesource.com/chromium/llvm-project/libcxx.git
 	os = all
 [submodule "third_party/libc++abi/trunk"]
 	path = third_party/libc++abi/trunk
-	url = https://llvm.googlesource.com/libcxxabi.git
+	url = https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git
 	os = all
 [submodule "third_party/libexif/sources"]
 	path = third_party/libexif/sources
@@ -238,10 +238,6 @@
 	path = third_party/liblouis/src
 	url = https://chromium.googlesource.com/external/liblouis.git
 	os = unix
-[submodule "third_party/libmtp"]
-	path = third_party/libmtp
-	url = https://chromium.googlesource.com/chromium/deps/libmtp.git
-	os = unix
 [submodule "third_party/libphonenumber/src/phonenumbers"]
 	path = third_party/libphonenumber/src/phonenumbers
 	url = https://chromium.googlesource.com/external/libphonenumber/cpp/src/phonenumbers.git
@@ -286,10 +282,6 @@
 	path = third_party/mingw-w64/mingw/bin
 	url = https://chromium.googlesource.com/native_client/deps/third_party/mingw-w64/mingw/bin.git
 	os = win
-[submodule "third_party/mtpd/source"]
-	path = third_party/mtpd/source
-	url = https://chromium.googlesource.com/chromiumos/platform/mtpd.git
-	os = unix
 [submodule "third_party/nacl_sdk_binaries"]
 	path = third_party/nacl_sdk_binaries
 	url = https://chromium.googlesource.com/chromium/deps/nacl_sdk_binaries.git
@@ -305,7 +297,7 @@
 [submodule "third_party/openssl"]
 	path = third_party/openssl
 	url = https://chromium.googlesource.com/chromium/deps/openssl.git
-	os = android,unix
+	os = all
 [submodule "third_party/opus/src"]
 	path = third_party/opus/src
 	url = https://chromium.googlesource.com/chromium/deps/opus.git
@@ -409,7 +401,7 @@
 [submodule "third_party/undoview"]
 	path = third_party/undoview
 	url = https://chromium.googlesource.com/chromium/deps/undoview.git
-	os = unix,ios
+	os = unix
 [submodule "third_party/usrsctp/usrsctplib"]
 	path = third_party/usrsctp/usrsctplib
 	url = https://chromium.googlesource.com/external/usrsctplib.git

diff --git a/breakpad/src b/breakpad/src
diff --git a/chrome/browser/resources/pdf/html_office b/chrome/browser/resources/pdf/html_office
diff --git a/chrome/installer/mac/third_party/xz/xz b/chrome/installer/mac/third_party/xz/xz
diff --git a/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin b/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin
diff --git a/chrome/test/data/perf/canvas_bench b/chrome/test/data/perf/canvas_bench
diff --git a/chrome/test/data/perf/frame_rate/content b/chrome/test/data/perf/frame_rate/content
diff --git a/chrome/test/data/perf/third_party/octane b/chrome/test/data/perf/third_party/octane
diff --git a/chrome/tools/test/reference_build/chrome_linux b/chrome/tools/test/reference_build/chrome_linux
diff --git a/chrome/tools/test/reference_build/chrome_mac b/chrome/tools/test/reference_build/chrome_mac
diff --git a/chrome/tools/test/reference_build/chrome_win b/chrome/tools/test/reference_build/chrome_win
diff --git a/media/cdm/ppapi/api b/media/cdm/ppapi/api
diff --git a/native_client b/native_client
diff --git a/sdch/open-vcdiff b/sdch/open-vcdiff
diff --git a/testing/gmock b/testing/gmock
diff --git a/testing/gtest b/testing/gtest
diff --git a/testing/iossim/third_party/class-dump b/testing/iossim/third_party/class-dump
diff --git a/third_party/WebKit b/third_party/WebKit
diff --git a/third_party/android_tools b/third_party/android_tools
diff --git a/third_party/angle b/third_party/angle
diff --git a/third_party/aosp b/third_party/aosp
diff --git a/third_party/apache-mime4j b/third_party/apache-mime4j
diff --git a/third_party/bidichecker b/third_party/bidichecker
diff --git a/third_party/bison b/third_party/bison
diff --git a/third_party/brotli/src b/third_party/brotli/src
diff --git a/third_party/cacheinvalidation/src b/third_party/cacheinvalidation/src
diff --git a/third_party/chromite b/third_party/chromite
diff --git a/third_party/clang_format/script b/third_party/clang_format/script
diff --git a/third_party/cld_2/src b/third_party/cld_2/src
diff --git a/third_party/cros_system_api b/third_party/cros_system_api
diff --git a/third_party/cygwin b/third_party/cygwin
diff --git a/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille b/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille
diff --git a/third_party/ffmpeg b/third_party/ffmpeg
diff --git a/third_party/findbugs b/third_party/findbugs
diff --git a/third_party/flac b/third_party/flac
diff --git a/third_party/fontconfig/src b/third_party/fontconfig/src
diff --git a/third_party/freetype b/third_party/freetype
diff --git a/third_party/freetype2/src b/third_party/freetype2/src
diff --git a/third_party/gnu_binutils b/third_party/gnu_binutils
diff --git a/third_party/gold b/third_party/gold
diff --git a/third_party/google_toolbox_for_mac/src b/third_party/google_toolbox_for_mac/src
diff --git a/third_party/gperf b/third_party/gperf
diff --git a/third_party/guava/src b/third_party/guava/src
diff --git a/third_party/httpcomponents-client b/third_party/httpcomponents-client
diff --git a/third_party/httpcomponents-core b/third_party/httpcomponents-core
diff --git a/third_party/hunspell b/third_party/hunspell
diff --git a/third_party/hunspell_dictionaries b/third_party/hunspell_dictionaries
diff --git a/third_party/icu b/third_party/icu
diff --git a/third_party/jarjar b/third_party/jarjar
diff --git a/third_party/jsoncpp/source/include b/third_party/jsoncpp/source/include
diff --git a/third_party/jsoncpp/source/src/lib_json b/third_party/jsoncpp/source/src/lib_json
diff --git a/third_party/jsr-305/src b/third_party/jsr-305/src
diff --git a/third_party/leveldatabase/src b/third_party/leveldatabase/src
diff --git a/third_party/libaddressinput/src b/third_party/libaddressinput/src
diff --git a/third_party/libc++/trunk b/third_party/libc++/trunk
diff --git a/third_party/libc++abi/trunk b/third_party/libc++abi/trunk
diff --git a/third_party/libexif/sources b/third_party/libexif/sources
diff --git a/third_party/libjingle/source/talk b/third_party/libjingle/source/talk
diff --git a/third_party/libjpeg_turbo b/third_party/libjpeg_turbo
diff --git a/third_party/liblouis/src b/third_party/liblouis/src
diff --git a/third_party/libphonenumber/src/phonenumbers b/third_party/libphonenumber/src/phonenumbers
diff --git a/third_party/libphonenumber/src/resources b/third_party/libphonenumber/src/resources
diff --git a/third_party/libphonenumber/src/test b/third_party/libphonenumber/src/test
diff --git a/third_party/libsrtp b/third_party/libsrtp
diff --git a/third_party/libvpx b/third_party/libvpx
diff --git a/third_party/libwebm/source b/third_party/libwebm/source
diff --git a/third_party/libyuv b/third_party/libyuv
diff --git a/third_party/lighttpd b/third_party/lighttpd
diff --git a/third_party/lss b/third_party/lss
diff --git a/third_party/mesa/src b/third_party/mesa/src
diff --git a/third_party/mingw-w64/mingw/bin b/third_party/mingw-w64/mingw/bin
diff --git a/third_party/nacl_sdk_binaries b/third_party/nacl_sdk_binaries
diff --git a/third_party/nss b/third_party/nss
diff --git a/third_party/openmax_dl b/third_party/openmax_dl
diff --git a/third_party/openssl b/third_party/openssl
diff --git a/third_party/opus/src b/third_party/opus/src
diff --git a/third_party/ots b/third_party/ots
diff --git a/third_party/pdfsqueeze b/third_party/pdfsqueeze
diff --git a/third_party/pefile b/third_party/pefile
diff --git a/third_party/perl b/third_party/perl
diff --git a/third_party/psyco_win32 b/third_party/psyco_win32
diff --git a/third_party/pyelftools b/third_party/pyelftools
diff --git a/third_party/pyftpdlib/src b/third_party/pyftpdlib/src
diff --git a/third_party/pymox/src b/third_party/pymox/src
diff --git a/third_party/pywebsocket/src b/third_party/pywebsocket/src
diff --git a/third_party/safe_browsing/testing b/third_party/safe_browsing/testing
diff --git a/third_party/scons-2.0.1 b/third_party/scons-2.0.1
diff --git a/third_party/sfntly/cpp/src b/third_party/sfntly/cpp/src
diff --git a/third_party/skia/gyp b/third_party/skia/gyp
diff --git a/third_party/skia/include b/third_party/skia/include
diff --git a/third_party/skia/src b/third_party/skia/src
diff --git a/third_party/smhasher/src b/third_party/smhasher/src
diff --git a/third_party/snappy/src b/third_party/snappy/src
diff --git a/third_party/speex b/third_party/speex
diff --git a/third_party/swig/Lib b/third_party/swig/Lib
diff --git a/third_party/swig/linux b/third_party/swig/linux
diff --git a/third_party/swig/mac b/third_party/swig/mac
diff --git a/third_party/swig/win b/third_party/swig/win
diff --git a/third_party/syzygy/binaries b/third_party/syzygy/binaries
diff --git a/third_party/trace-viewer b/third_party/trace-viewer
diff --git a/third_party/undoview b/third_party/undoview
diff --git a/third_party/usrsctp/usrsctplib b/third_party/usrsctp/usrsctplib
diff --git a/third_party/v8-i18n b/third_party/v8-i18n
diff --git a/third_party/webdriver/pylib b/third_party/webdriver/pylib
diff --git a/third_party/webpagereplay b/third_party/webpagereplay
diff --git a/third_party/webrtc b/third_party/webrtc
diff --git a/third_party/xdg-utils b/third_party/xdg-utils
diff --git a/third_party/yasm/binaries b/third_party/yasm/binaries
diff --git a/third_party/yasm/source/patched-yasm b/third_party/yasm/source/patched-yasm
diff --git a/tools/deps2git b/tools/deps2git
diff --git a/tools/grit b/tools/grit
diff --git a/tools/gyp b/tools/gyp
diff --git a/tools/page_cycler/acid3 b/tools/page_cycler/acid3
diff --git a/tools/swarming_client b/tools/swarming_client
diff --git a/v8 b/v8