Merge chromium at 9.0.597.55: Initial merge by git.

Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad

7 files changed, 86 insertions, 22 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 19fd005..9c33cc8 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -187,7 +187,8 @@
             '../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',
+            '../views/views.gyp:views_unittests',
+            '../third_party/WebKit/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
             # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
             # This should:
             # 1) not be the case. OR.
@@ -343,7 +344,7 @@
             '../printing/printing.gyp:printing_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
-            '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
+            '../third_party/WebKit/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
             # TODO(nsylvain) ui_tests.exe depends on test_shell_common.
             # This should:
             # 1) not be the case. OR.
@@ -380,6 +381,32 @@
           ],
         },
       ],  # targets
+      'conditions': [
+        ['(branding=="Chrome" and buildtype=="Official")', {
+          'targets': [
+            {
+              'target_name': 'chrome_official_builder',
+              'type': 'none',
+              'dependencies': [
+                '../chrome/app/locales/locales.gyp:*',
+                '../chrome/chrome.gyp:crash_service',
+                '../chrome/chrome.gyp:page_cycler_tests',
+                '../chrome/chrome.gyp:pyautolib',
+                '../chrome/chrome.gyp:reliability_tests',
+                '../chrome/chrome.gyp:startup_tests',
+                '../chrome/chrome.gyp:automated_ui_tests',
+                '../chrome/installer/mini_installer.gyp:mini_installer',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+                '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+                '../courgette/courgette.gyp:courgette',
+                '../pdf/pdf.gyp:pdf',
+                '../third_party/adobe/flash/flash_player.gyp:flash_player',
+                '../webkit/webkit.gyp:test_shell',
+              ],
+            },
+          ], # targets
+        }], # (branding=="Chrome" and buildtype=="Official")
+       ], # conditions
     }], # OS="win"
     ['chromeos==1', {
       'targets': [
diff --git a/build/build_config.h b/build/build_config.h
index 960be0d..35b1ddf 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -134,4 +134,10 @@
 #error Please add support for your compiler in build/build_config.h
 #endif
 
+#if defined(OS_CHROMEOS)
+// Single define to trigger whether CrOS fonts have BCI on.
+// In that case font sizes/deltas should be adjusted.
+//define CROS_FONTS_USING_BCI
+#endif
+
 #endif  // BUILD_BUILD_CONFIG_H_
diff --git a/build/common.gypi b/build/common.gypi
index abfe14c..1b260cd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1168,6 +1168,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.
@@ -1276,6 +1279,8 @@
                 # Don't die on dtoa code that uses a char as an array index.
                 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
                 '-Wno-char-subscripts',
+                # Clang spots more unused functions.
+                '-Wno-unused-function',
                 # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
                 # http://code.google.com/p/googletest/source/detail?r=446 .
                 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
diff --git a/build/linux/pkg-config-wrapper b/build/linux/pkg-config-wrapper
index d94b997..4b5455b 100755
--- a/build/linux/pkg-config-wrapper
+++ b/build/linux/pkg-config-wrapper
@@ -1,16 +1,37 @@
-#!/bin/sh
+#!/bin/bash
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This program wraps around pkg-config to generate the correct include and
+# library paths when cross-compiling using a sysroot.
+# The assumption is that the sysroot contains the .pc files in usr/lib/pkgconfig
+# and usr/share/pkgconfig (relative to the sysroot) and that they output paths
+# relative to some parent path of the sysroot.
+# This assumption is valid for a range of sysroots, in particular: a
+# LSB-compliant root filesystem mounted at the sysroot, and a board build
+# directory of a Chromium OS chroot.
 
 root="$1"
 if [ -z "$root" ]
 then
-  echo "usage: $0 /path/to/sysroot [pkg-config-arguments]" >&2
+  echo "usage: $0 /path/to/sysroot [pkg-config-arguments] package" >&2
   exit 1
 fi
 
 rewrite=`dirname $0`/rewrite_dirs.py
+package=${!#}
 
 shift
 config_path=$root/usr/lib/pkgconfig:$root/usr/share/pkgconfig
 set -e
-result=`PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr "$@"`
-echo "$result"| $rewrite $root
+# Some sysroots, like the Chromium OS ones, may generate paths that are not
+# relative to the sysroot. For example,
+# /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all paths
+# relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr) instead of
+# relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr).
+# To support this correctly, it's necessary to extract the prefix to strip from
+# pkg-config's |prefix| variable.
+prefix=`PKG_CONFIG_PATH=$config_path pkg-config --variable=prefix "$package" | sed -e 's|/usr$||'`
+result=`PKG_CONFIG_PATH=$config_path pkg-config "$@"`
+echo "$result"| $rewrite --sysroot "$root" --strip-prefix "$prefix"
diff --git a/build/linux/rewrite_dirs.py b/build/linux/rewrite_dirs.py
index 5c41cf9..9e166d0 100755
--- a/build/linux/rewrite_dirs.py
+++ b/build/linux/rewrite_dirs.py
@@ -7,6 +7,7 @@
 
 import sys
 import os
+import optparse
 
 REWRITE_PREFIX = ['-I',
                   '-idirafter',
@@ -18,15 +19,19 @@ REWRITE_PREFIX = ['-I',
                   '-isystem',
                   '-L']
 
-def RewritePath(path, sysroot):
-  """Rewrites a path by prefixing it with the sysroot if it is absolute."""
+def RewritePath(path, opts):
+  """Rewrites a path by stripping the prefix and prepending the sysroot."""
+  sysroot = opts.sysroot
+  prefix = opts.strip_prefix
   if os.path.isabs(path) and not path.startswith(sysroot):
+    if path.startswith(prefix):
+      path = path[len(prefix):]
     path = path.lstrip('/')
     return os.path.join(sysroot, path)
   else:
     return path
 
-def RewriteLine(line, sysroot):
+def RewriteLine(line, opts):
   """Rewrites all the paths in recognized options."""
   args = line.split()
   count = len(args)
@@ -38,25 +43,24 @@ def RewriteLine(line, sysroot):
       if args[i] == prefix:
         i += 1
         try:
-          args[i] = RewritePath(args[i], sysroot)
+          args[i] = RewritePath(args[i], opts)
         except IndexError:
           sys.stderr.write('Missing argument following %s\n' % prefix)
           break
       elif args[i].startswith(prefix):
-        args[i] = prefix + RewritePath(args[i][len(prefix):], sysroot)
+        args[i] = prefix + RewritePath(args[i][len(prefix):], opts)
     i += 1
 
   return ' '.join(args)
 
 def main(argv):
-  try:
-    sysroot = argv[1]
-  except IndexError:
-    sys.stderr.write('usage: %s /path/to/sysroot\n' % argv[0])
-    return 1
+  parser = optparse.OptionParser()
+  parser.add_option('-s', '--sysroot', default='/', help='sysroot to prepend')
+  parser.add_option('-p', '--strip-prefix', default='', help='prefix to strip')
+  opts, args = parser.parse_args(argv[1:])
 
   for line in sys.stdin.readlines():
-    line = RewriteLine(line.strip(), sysroot)
+    line = RewriteLine(line.strip(), opts)
     print line
   return 0
 
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 59cf486..85f8063 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -46,6 +46,11 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
             ],
           },
+      }],
+      [ 'chromeos==1', {
+        'link_settings': {
+          'libraries': [ '-lXtst' ]
+        }
       }]]
     },
     {
diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
index 3f34b1b..7bd040c 100644
--- a/build/whitespace_file.txt
+++ b/build/whitespace_file.txt
@@ -6,8 +6,4 @@ This file is used for making non-code changes to trigger buildbot cycles. Make
 any modification below this line.
 ================================================================================
 
-
-
-
- 
-
+I AM SOMEWHAT SPARTA