Supporting high dpi favicons in Instant Extended.

.gitmodules

Index: .gitmodules
diff --git a/.gitmodules b/.gitmodules
index f0b44be9c011dca3e7d2d8757fcf03d385a2b732..fec0576ceca2e5c807326ae406c69286a1274ef7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,6 +22,10 @@
 	path = chrome/test/data/perf/frame_rate/content
 	url = https://chromium.googlesource.com/chromium/frame_rate/content.git
 	os = all
+[submodule "chrome/test/data/perf/third_party/octane"]
+	path = chrome/test/data/perf/third_party/octane
+	url = https://chromium.googlesource.com/external/octane-benchmark.git
+	os = all
 [submodule "chrome/tools/test/reference_build/chrome_linux"]
 	path = chrome/tools/test/reference_build/chrome_linux
 	url = https://chromium.googlesource.com/chromium/reference_builds/chrome_linux.git
@@ -38,78 +42,6 @@
 	path = chrome_frame/tools/test/reference_build/chrome_win
 	url = https://chromium.googlesource.com/chromium/reference_builds/chrome_win.git
 	os = win
-[submodule "content/test/data/layout_tests/LayoutTests/fast/events"]
-	path = content/test/data/layout_tests/LayoutTests/fast/events
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/fast/filesystem/resources"]
-	path = content/test/data/layout_tests/LayoutTests/fast/filesystem/resources
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/fast/js/resources"]
-	path = content/test/data/layout_tests/LayoutTests/fast/js/resources
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/fast/workers"]
-	path = content/test/data/layout_tests/LayoutTests/fast/workers
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/http/tests/appcache"]
-	path = content/test/data/layout_tests/LayoutTests/http/tests/appcache
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/http/tests/resources"]
-	path = content/test/data/layout_tests/LayoutTests/http/tests/resources
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests"]
-	path = content/test/data/layout_tests/LayoutTests/http/tests/websocket/tests
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/http/tests/workers"]
-	path = content/test/data/layout_tests/LayoutTests/http/tests/workers
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest"]
-	path = content/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/media"]
-	path = content/test/data/layout_tests/LayoutTests/media
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/events
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium-win/fast/workers
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium-win/http/tests/workers
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium-win/storage/domstorage
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium/fast/events
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers"]
-	path = content/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/storage/domstorage"]
-	path = content/test/data/layout_tests/LayoutTests/storage/domstorage
-	url = 
-	os = ios
-[submodule "content/test/data/layout_tests/LayoutTests/storage/indexeddb"]
-	path = content/test/data/layout_tests/LayoutTests/storage/indexeddb
-	url = 
-	os = ios
 [submodule "googleurl"]
 	path = googleurl
 	url = https://chromium.googlesource.com/external/google-url.git
@@ -118,10 +50,6 @@
 	path = native_client
 	url = https://chromium.googlesource.com/native_client/src/native_client.git
 	os = all
-[submodule "sandbox/linux/seccomp-legacy"]
-	path = sandbox/linux/seccomp-legacy
-	url = https://chromium.googlesource.com/external/seccompsandbox.git
-	os = all
 [submodule "sdch/open-vcdiff"]
 	path = sdch/open-vcdiff
 	url = https://chromium.googlesource.com/external/open-vcdiff.git
@@ -144,7 +72,11 @@
 	os = ios,mac
 [submodule "third_party/WebKit"]
 	path = third_party/WebKit
-	url = https://chromium.googlesource.com/external/WebKit_trimmed.git
+	url = https://chromium.googlesource.com/chromium/blink.git
+	os = all
+[submodule "third_party/accessibility-developer-tools"]
+	path = third_party/accessibility-developer-tools
+	url = https://chromium.googlesource.com/external/accessibility-developer-tools.git
 	os = all
 [submodule "third_party/android_tools"]
 	path = third_party/android_tools
@@ -158,6 +90,10 @@
 	path = third_party/aosp
 	url = https://chromium.googlesource.com/chromium/deps/aosp.git
 	os = android
+[submodule "third_party/apache-mime4j"]
+	path = third_party/apache-mime4j
+	url = https://chromium.googlesource.com/chromium/deps/apache-mime4j.git
+	os = android
 [submodule "third_party/bidichecker"]
 	path = third_party/bidichecker
 	url = https://chromium.googlesource.com/external/bidichecker/lib.git
@@ -170,6 +106,10 @@
 	path = third_party/cacheinvalidation/src
 	url = https://chromium.googlesource.com/external/google-cache-invalidation-api/src.git
 	os = all
+[submodule "third_party/chromite"]
+	path = third_party/chromite
+	url = https://chromium.googlesource.com/chromiumos/chromite.git
+	os = unix
 [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
@@ -182,10 +122,18 @@
 	path = third_party/cygwin
 	url = https://chromium.googlesource.com/chromium/deps/cygwin.git
 	os = win
+[submodule "third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille"]
+	path = third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille
+	url = https://chromium.googlesource.com/external/eyes-free/braille/client/src/com/googlecode/eyesfree/braille.git
+	os = android
 [submodule "third_party/ffmpeg"]
 	path = third_party/ffmpeg
 	url = https://chromium.googlesource.com/chromium/third_party/ffmpeg.git
 	os = all
+[submodule "third_party/findbugs"]
+	path = third_party/findbugs
+	url = https://chromium.googlesource.com/chromium/deps/findbugs.git
+	os = android
 [submodule "third_party/flac"]
 	path = third_party/flac
 	url = https://chromium.googlesource.com/chromium/deps/flac.git
@@ -194,6 +142,10 @@
 	path = third_party/freetype
 	url = https://chromium.googlesource.com/chromium/src/third_party/freetype.git
 	os = android
+[submodule "third_party/freetype2/src"]
+	path = third_party/freetype2/src
+	url = https://chromium.googlesource.com/chromium/src/third_party/freetype2.git
+	os = unix
 [submodule "third_party/gnu_binutils"]
 	path = third_party/gnu_binutils
 	url = https://chromium.googlesource.com/native_client/deps/third_party/gnu_binutils.git
@@ -206,6 +158,18 @@
 	path = third_party/gperf
 	url = https://chromium.googlesource.com/chromium/deps/gperf.git
 	os = win
+[submodule "third_party/guava/src"]
+	path = third_party/guava/src
+	url = https://chromium.googlesource.com/external/guava-libraries.git
+	os = android
+[submodule "third_party/httpcomponents-client"]
+	path = third_party/httpcomponents-client
+	url = https://chromium.googlesource.com/chromium/deps/httpcomponents-client.git
+	os = android
+[submodule "third_party/httpcomponents-core"]
+	path = third_party/httpcomponents-core
+	url = https://chromium.googlesource.com/chromium/deps/httpcomponents-core.git
+	os = android
 [submodule "third_party/hunspell"]
 	path = third_party/hunspell
 	url = https://chromium.googlesource.com/chromium/deps/hunspell.git
@@ -218,6 +182,10 @@
 	path = third_party/icu
 	url = https://chromium.googlesource.com/chromium/deps/icu46.git
 	os = all
+[submodule "third_party/jarjar"]
+	path = third_party/jarjar
+	url = https://chromium.googlesource.com/chromium/deps/jarjar.git
+	os = android
 [submodule "third_party/jsoncpp/source/include"]
 	path = third_party/jsoncpp/source/include
 	url = https://chromium.googlesource.com/external/jsoncpp/jsoncpp/include.git
@@ -226,6 +194,10 @@
 	path = third_party/jsoncpp/source/src/lib_json
 	url = https://chromium.googlesource.com/external/jsoncpp/jsoncpp/src/lib_json.git
 	os = all
+[submodule "third_party/jsr-305/src"]
+	path = third_party/jsr-305/src
+	url = https://chromium.googlesource.com/external/jsr-305.git
+	os = android
 [submodule "third_party/leveldatabase/src"]
 	path = third_party/leveldatabase/src
 	url = https://chromium.googlesource.com/external/leveldb.git
@@ -277,19 +249,15 @@
 [submodule "third_party/lss"]
 	path = third_party/lss
 	url = https://chromium.googlesource.com/external/linux-syscall-support/lss.git
-	os = unix
+	os = android,unix
+[submodule "third_party/mesa/src"]
+	path = third_party/mesa/src
+	url = https://chromium.googlesource.com/chromium/deps/mesa.git
+	os = all
 [submodule "third_party/mingw-w64/mingw/bin"]
 	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/mozc/chrome/chromeos/renderer"]
-	path = third_party/mozc/chrome/chromeos/renderer
-	url = https://chromium.googlesource.com/external/mozc/src/chrome/chromeos/renderer.git
-	os = all
-[submodule "third_party/mozc/session"]
-	path = third_party/mozc/session
-	url = https://chromium.googlesource.com/external/mozc/src/session.git
-	os = all
 [submodule "third_party/mtpd/source"]
 	path = third_party/mtpd/source
 	url = https://chromium.googlesource.com/chromiumos/platform/mtpd.git
@@ -302,10 +270,14 @@
 	path = third_party/nss
 	url = https://chromium.googlesource.com/chromium/deps/nss.git
 	os = win,ios,mac
+[submodule "third_party/openmax_dl"]
+	path = third_party/openmax_dl
+	url = https://chromium.googlesource.com/external/webrtc/deps/third_party/openmax.git
+	os = all
 [submodule "third_party/openssl"]
 	path = third_party/openssl
 	url = https://chromium.googlesource.com/chromium/deps/openssl.git
-	os = unix
+	os = android,unix
 [submodule "third_party/opus/src"]
 	path = third_party/opus/src
 	url = https://chromium.googlesource.com/chromium/deps/opus.git
@@ -330,6 +302,10 @@
 	path = third_party/psyco_win32
 	url = https://chromium.googlesource.com/chromium/deps/psyco_win32.git
 	os = win
+[submodule "third_party/pyelftools"]
+	path = third_party/pyelftools
+	url = https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git
+	os = unix
 [submodule "third_party/pyftpdlib/src"]
 	path = third_party/pyftpdlib/src
 	url = https://chromium.googlesource.com/external/pyftpdlib.git
@@ -413,6 +389,10 @@
 [submodule "third_party/undoview"]
 	path = third_party/undoview
 	url = https://chromium.googlesource.com/chromium/deps/undoview.git
+	os = unix,ios
+[submodule "third_party/usrsctp/usrsctplib"]
+	path = third_party/usrsctp/usrsctplib
+	url = https://chromium.googlesource.com/external/usrsctplib.git
 	os = all
 [submodule "third_party/v8-i18n"]
 	path = third_party/v8-i18n
@@ -432,7 +412,7 @@
 	os = all
 [submodule "third_party/webrtc"]
 	path = third_party/webrtc
-	url = https://chromium.googlesource.com/external/webrtc/stable/src.git
+	url = https://chromium.googlesource.com/external/webrtc/stable/webrtc.git
 	os = all
 [submodule "third_party/xdg-utils"]
 	path = third_party/xdg-utils
@@ -474,3 +454,7 @@
 	path = v8
 	url = https://chromium.googlesource.com/external/v8.git
 	os = all
+[submodule "webkit/renderer/media/crypto/ppapi/cdm"]
+	path = webkit/renderer/media/crypto/ppapi/cdm
+	url = https://chromium.googlesource.com/chromium/cdm.git
+	os = all