Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

7 files changed, 137 insertions, 12 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 26ded8e..87fe78f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -20,7 +20,7 @@
         '../jingle/jingle.gyp:*',
         '../media/media.gyp:*',
         '../net/net.gyp:*',
-        '../net/third_party/nss/ssl.gyp:*',
+        '../ppapi/ppapi.gyp:*',
         '../printing/printing.gyp:*',
         '../sdch/sdch.gyp:*',
         '../skia/skia.gyp:*',
@@ -31,17 +31,17 @@
         '../third_party/cld/cld.gyp:*',
         '../third_party/codesighs/codesighs.gyp:*',
         '../third_party/ffmpeg/ffmpeg.gyp:*',
+        '../third_party/iccjpeg/iccjpeg.gyp:*',
         '../third_party/icu/icu.gyp:*',
         '../third_party/libjpeg/libjpeg.gyp:*',
-        '../third_party/libwebp/libwebp.gyp:*',
         '../third_party/libpng/libpng.gyp:*',
+        '../third_party/libwebp/libwebp.gyp:*',
         '../third_party/libxml/libxml.gyp:*',
         '../third_party/libxslt/libxslt.gyp:*',
         '../third_party/lzma_sdk/lzma_sdk.gyp:*',
         '../third_party/mesa/mesa.gyp:*',
         '../third_party/modp_b64/modp_b64.gyp:*',
         '../third_party/npapi/npapi.gyp:*',
-        '../third_party/ppapi/ppapi.gyp:*',
         '../third_party/ots/ots.gyp:*',
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
@@ -103,6 +103,7 @@
           'dependencies': [
             '../breakpad/breakpad.gyp:*',
             '../chrome/app/locales/locales.gyp:*',
+            '../ceee/ceee.gyp:*',
             '../chrome_frame/chrome_frame.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
@@ -134,8 +135,67 @@
             '../remoting/remoting.gyp:*',
           ],
         }],
+        ['use_openssl!=1', {
+          'dependencies': [
+            '../net/third_party/nss/ssl.gyp:*',
+          ],
+        }],
       ],
     },
+    {
+      'target_name': 'chromium_builder_tests',
+      'type': 'none',
+      'dependencies': [
+        '../app/app.gyp:app_unittests',
+        '../base/base.gyp:base_unittests',
+        '../chrome/chrome.gyp:browser_tests',
+        '../chrome/chrome.gyp:interactive_ui_tests',
+        '../chrome/chrome.gyp:nacl_ui_tests',
+        '../chrome/chrome.gyp:nacl_sandbox_tests',
+        '../chrome/chrome.gyp:safe_browsing_tests',
+        '../chrome/chrome.gyp:sync_integration_tests',
+        '../chrome/chrome.gyp:sync_unit_tests',
+        '../chrome/chrome.gyp:ui_tests',
+        '../chrome/chrome.gyp:unit_tests',
+        '../gfx/gfx.gyp:gfx_unittests',
+        '../gpu/gpu.gyp:gpu_unittests',
+        '../ipc/ipc.gyp:ipc_tests',
+        '../jingle/jingle.gyp:notifier_unit_tests',
+        '../media/media.gyp:media_unittests',
+        '../net/net.gyp:net_unittests',
+        '../printing/printing.gyp:printing_unittests',
+        '../remoting/remoting.gyp:remoting_unittests',
+        '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
+        'temp_gyp/googleurl.gyp:googleurl_unittests',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            '../chrome/chrome.gyp:installer_util_unittests',
+            '../chrome/chrome.gyp:mini_installer_test',
+            # mini_installer_tests depends on mini_installer. This should be
+            # defined in installer.gyp.
+            '../chrome/installer/mini_installer.gyp:mini_installer',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+            '../courgette/courgette.gyp:courgette_unittests',
+            '../sandbox/sandbox.gyp:sbox_integration_tests',
+            '../sandbox/sandbox.gyp:sbox_unittests',
+            '../sandbox/sandbox.gyp:sbox_validation_tests',
+            '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
+            # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
+            # This should:
+            # 1) not be the case. OR.
+            # 2) be expressed in the ui tests dependencies.
+            '../webkit/webkit.gyp:test_shell_common',
+           ],
+        }],
+      ],
+     }
   ],
   'conditions': [
     ['OS=="mac"', {
diff --git a/build/build_config.h b/build/build_config.h
index 21f9b3c..63dac1f 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -47,14 +47,21 @@
 
 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \
     defined(OS_SOLARIS)
-#define USE_NSS 1  // Use NSS for crypto.
+#if !defined(USE_OPENSSL)
+#define USE_NSS 1  // Default to use NSS for crypto, unless OpenSSL is chosen.
+#endif
 #define USE_X11 1  // Use X for graphics.
 #endif
 
+<<<<<<< HEAD
 #if defined(ANDROID)
 #define USE_OPENSSL 1
 #undef USE_NSS
 #define USE_SYSTEM_ZLIB 1
+=======
+#if defined(USE_OPENSSL) && defined(USE_NSS)
+#error Cannot use both OpenSSL and NSS
+>>>>>>> chromium.org at r65505
 #endif
 
 // For access to standard POSIXish features, use OS_POSIX instead of a
diff --git a/build/common.gypi b/build/common.gypi
index 9f87a44..97863a9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -392,6 +392,11 @@
           'NACL_WIN64',
         ],
       }],
+      ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
+        'use_cups%': 1,
+      }, {
+        'use_cups%': 0,
+      }],
     ],
 
     # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
@@ -429,6 +434,12 @@
       # See http://msdn.microsoft.com/en-us/library/47238hez(VS.71).aspx
       'win_debug_InlineFunctionExpansion%': '',    # empty = default, 0 = off,
       'win_release_InlineFunctionExpansion%': '2', # 1 = only __inline, 2 = max
+      # VS inserts quite a lot of extra checks to algorithms like
+      # std::partial_sort in Debug build which make them O(N^2)
+      # instead of O(N*logN). This is particularly slow under memory
+      # tools like ThreadSanitizer so we want it to be disablable.
+      # See http://msdn.microsoft.com/en-us/library/aa985982(v=VS.80).aspx
+      'win_debug_disable_iterator_debugging%': '0',
 
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
@@ -650,8 +661,7 @@
       #   2 == /INCREMENTAL
       # Debug links incremental, Release does not.
       #
-      # Abstract base configurations to cover common
-      # attributes.
+      # Abstract base configurations to cover common attributes.
       #
       'Common_Base': {
         'abstract': 1,
@@ -718,6 +728,9 @@
                 'InlineFunctionExpansion':
                   '<(win_debug_InlineFunctionExpansion)',
               }],
+              ['win_debug_disable_iterator_debugging==1', {
+                'PreprocessorDefinitions': ['_HAS_ITERATOR_DEBUGGING=0'],
+              }],
             ],
           },
           'VCLinkerTool': {
@@ -1152,6 +1165,9 @@
               # http://code.google.com/p/googletest/source/detail?r=446 .
               # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
               '-Wno-unnamed-type-template-args',
+              # The integrated assembler chokes on one ffmpeg file.
+              # http://crbug.com/61931
+              '-no-integrated-as',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
diff --git a/build/features_override.gypi b/build/features_override.gypi
index 6c38efa..5c069ea 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -11,6 +11,7 @@
     # but not listed below, it will revert to its hardcoded webkit value.
     'feature_defines': [
       'ENABLE_3D_CANVAS=1',
+      'ENABLE_3D_PLUGIN=1',
       'ENABLE_BLOB=1',
       'ENABLE_BLOB_SLICE=1',
       'ENABLE_CHANNEL_MESSAGING=1',
@@ -54,6 +55,8 @@
       'ENABLE_XHR_RESPONSE_BLOB=1',
       'ENABLE_XPATH=1',
       'ENABLE_XSLT=1',
+      'WTF_USE_WEBP=1',
+      'WTF_USE_WEBKIT_IMAGE_DECODERS=1',
     ],
     # We have to nest variables inside variables so that they can be overridden
     # through GYP_DEFINES.
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 174ea29..2171770 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -18,6 +18,33 @@ chrome_src = os.path.normpath(os.path.join(script_dir, os.pardir))
 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
 import gyp
 
+def apply_gyp_environment(file_path=None):
+  """
+  Reads in a *.gyp_env file and applies the valid keys to os.environ.
+  """
+  if not file_path or not os.path.exists(file_path):
+    return
+  file_contents = open(file_path).read()
+  try:
+    file_data = eval(file_contents, {'__builtins__': None}, None)
+  except SyntaxError, e:
+    e.filename = os.path.abspath(file_path)
+    raise
+  supported_vars = ( 'CHROMIUM_GYP_FILE',
+                     'CHROMIUM_GYP_SYNTAX_CHECK',
+                     'GYP_DEFINES',
+                     'GYP_GENERATOR_FLAGS',
+                     'GYP_GENERATOR_OUTPUT', )
+  for var in supported_vars:
+    val = file_data.get(var)
+    if val:
+      if var in os.environ:
+        print 'INFO: Environment value for "%s" overrides value in %s.' % (
+            var, os.path.abspath(file_path)
+        )
+      else:
+        os.environ[var] = val
+
 def additional_include_files(args=[]):
   """
   Returns a list of additional (.gypi) files to include, without
@@ -51,6 +78,11 @@ def additional_include_files(args=[]):
 if __name__ == '__main__':
   args = sys.argv[1:]
 
+  if 'SKIP_CHROMIUM_GYP_ENV' not in os.environ:
+    # Update the environment based on chromium.gyp_env
+    gyp_env_path = os.path.join(os.path.dirname(chrome_src), 'chromium.gyp_env')
+    apply_gyp_environment(gyp_env_path)
+
   # This could give false positives since it doesn't actually do real option
   # parsing.  Oh well.
   gyp_file_specified = False
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 41289cf..3ed5513 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -106,9 +106,10 @@ dev_list="apache2 bison fakeroot flex g++ gperf libapache2-mod-php5
           libgconf2-dev libgl1-mesa-dev libglu1-mesa-dev libglib2.0-dev
           libgnome-keyring-dev libgtk2.0-dev libjpeg62-dev libnspr4-dev
           libnss3-dev libpam0g-dev libsqlite3-dev libxslt1-dev libxss-dev
-          lighttpd mesa-common-dev msttcorefonts patch perl php5-cgi pkg-config
-          python python-dev rpm subversion ttf-dejavu-core ttf-kochi-gothic
-          ttf-kochi-mincho wdiff libcurl4-gnutls-dev $chromeos_dev_list"
+          libxtst-dev lighttpd mesa-common-dev msttcorefonts patch perl
+          php5-cgi pkg-config python python-dev rpm subversion ttf-dejavu-core
+          ttf-kochi-gothic ttf-kochi-mincho wdiff libcurl4-gnutls-dev
+          $chromeos_dev_list"
 
 # Run-time libraries required by chromeos only
 chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev"
@@ -119,7 +120,8 @@ lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libdbus-glib-1-2 libexpat1
           libnspr4-0d libnss3-1d libpango1.0-0 libpcre3 libpixman-1-0 libpng12-0
           libstdc++6 libsqlite3-0 libx11-6 libxau6 libxcb1 libxcomposite1
           libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3 libxi6
-          libxinerama1 libxrandr2 libxrender1 zlib1g $chromeos_lib_list"
+          libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g
+          $chromeos_lib_list"
 
 # Debugging symbols for all of the run-time libraries
 dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg
@@ -128,7 +130,7 @@ dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg
           libx11-6-dbg libxau6-dbg libxcb1-dbg libxcomposite1-dbg
           libxcursor1-dbg libxdamage1-dbg libxdmcp6-dbg libxext6-dbg
           libxfixes3-dbg libxi6-dbg libxinerama1-dbg libxrandr2-dbg
-          libxrender1-dbg zlib1g-dbg"
+          libxrender1-dbg libxtst6-dbg zlib1g-dbg"
 
 # CUPS package changed its name from hardy to the next version. Include
 # proper package here depending on the system.
diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
index 11fa622..3f34b1b 100644
--- a/build/whitespace_file.txt
+++ b/build/whitespace_file.txt
@@ -5,4 +5,9 @@ found in the LICENSE file.
 This file is used for making non-code changes to trigger buildbot cycles. Make
 any modification below this line.
 ================================================================================
- 
\ No newline at end of file
+
+
+
+
+ 
+