Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

2 files changed, 31 insertions, 0 deletions

diff --git a/chromium/third_party/guava/guava.gyp b/chromium/third_party/guava/guava.gyp
index bfe2a30fe86..e300460271f 100644
--- a/chromium/third_party/guava/guava.gyp
+++ b/chromium/third_party/guava/guava.gyp
@@ -9,6 +9,8 @@
       'type': 'none',
       'variables': {
         'java_in_dir': 'src/guava',
+        'proguard_preprocess': 1,
+        'proguard_config': 'proguard.flags',
       },
       'dependencies': [
         '../../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
diff --git a/chromium/third_party/guava/proguard.flags b/chromium/third_party/guava/proguard.flags
new file mode 100644
index 00000000000..604059ae3c0
--- /dev/null
+++ b/chromium/third_party/guava/proguard.flags
@@ -0,0 +1,29 @@
+# Copyright 2013 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.
+
+-keep class com.google.common.base.** {
+  *;
+}
+
+-keep class com.google.common.annotations.** {
+  *;
+}
+
+-keepattributes Signature
+
+# Don't complain about usage of sun.misc.Unsafe. Guava imports this,
+# but does not use it unless it exists.
+# The gyp-target that uses this is guava.gyp:guava_javalib.
+-dontwarn sun.misc.Unsafe
+# Striped64 uses reflection to access some local fields.
+-dontnote com.google.common.cache.Striped64
+-dontnote com.google.common.cache.Striped64$Cell
+
+# Keep all enum values and valueOf methods. See
+# http://proguard.sourceforge.net/index.html#manual/examples.html
+# for the reason for this. Also, see http://crbug.com/248037.
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}