Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

4 files changed, 173 insertions, 54 deletions

diff --git a/chromium/third_party/libaddressinput/chromium/cpp/grit.gyp b/chromium/third_party/libaddressinput/chromium/cpp/grit.gyp
index b849e41775c..3a2b70ef90e 100644
--- a/chromium/third_party/libaddressinput/chromium/cpp/grit.gyp
+++ b/chromium/third_party/libaddressinput/chromium/cpp/grit.gyp
@@ -27,8 +27,8 @@
           'action_name': 'generate_messages',
           'inputs': [
             '<(grit_dir)/grit.py',
-            'res/messages.grd',
-            'res/messages.grdp',
+            'res/libaddressinput_strings.grd',
+            'res/libaddressinput_strings.grdp',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/en_messages.cc',
diff --git a/chromium/third_party/libaddressinput/chromium/cpp/libaddressinput.gyp b/chromium/third_party/libaddressinput/chromium/cpp/libaddressinput.gyp
index 43b76d3bd8f..8c441883c6b 100644
--- a/chromium/third_party/libaddressinput/chromium/cpp/libaddressinput.gyp
+++ b/chromium/third_party/libaddressinput/chromium/cpp/libaddressinput.gyp
@@ -31,53 +31,55 @@
       'target_name': 'libaddressinput',
       'type': '<(component)',
       'sources': [
+        'src/address_data.cc',
         'src/address_field.cc',
-        'src/address_field_util.cc',
         'src/address_problem.cc',
         'src/address_ui.cc',
         'src/address_validator.cc',
-        'src/localization.cc',
-        'src/lookup_key_util.cc',
+        'src/country_rules_aggregator.cc',
+        'src/fallback_data_store.cc',
         'src/region_data_constants.cc',
         'src/retriever.cc',
         'src/rule.cc',
-        'src/rule_retriever.cc',
+        'src/ruleset.cc',
+        'src/util/canonicalize_string.cc',
         'src/util/json.cc',
         'src/util/md5.cc',
-        'src/util/string_split.cc',
-        'src/validating_storage.cc',
-        'src/validating_util.cc',
+        'src/util/string_util.cc',
+        'src/util/trie.cc',
       ],
       'defines': [
-        'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-address/"',
+        'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"',
       ],
       'dependencies': [
         'grit.gyp:generated_messages',
         'rapidjson.gyp:rapidjson',
+        're2.gyp:re2',
       ],
     },
     {
       'target_name': 'unit_tests',
       'type': 'executable',
       'sources': [
-        'test/address_field_util_test.cc',
+        'test/address_data_test.cc',
         'test/address_ui_test.cc',
+        'test/address_validator_test.cc',
+        'test/country_rules_aggregator_test.cc',
         'test/fake_downloader.cc',
         'test/fake_downloader_test.cc',
         'test/fake_storage.cc',
         'test/fake_storage_test.cc',
-        'test/localization_test.cc',
-        'test/lookup_key_util_test.cc',
+        'test/fallback_data_store_test.cc',
         'test/region_data_constants_test.cc',
         'test/retriever_test.cc',
-        'test/rule_retriever_test.cc',
         'test/rule_test.cc',
+        'test/storage_test_runner.cc',
         'test/util/json_test.cc',
         'test/util/md5_unittest.cc',
         'test/util/scoped_ptr_unittest.cc',
-        'test/util/string_split_unittest.cc',
-        'test/validating_storage_test.cc',
-        'test/validating_util_test.cc',
+        'test/util/stl_util_unittest.cc',
+        'test/util/string_util_test.cc',
+        'test/util/trie_test.cc',
       ],
       'defines': [
         'TEST_DATA_DIR="../testdata"',
diff --git a/chromium/third_party/libaddressinput/chromium/cpp/re2.gyp b/chromium/third_party/libaddressinput/chromium/cpp/re2.gyp
new file mode 100644
index 00000000000..961178cb719
--- /dev/null
+++ b/chromium/third_party/libaddressinput/chromium/cpp/re2.gyp
@@ -0,0 +1,37 @@
+# Copyright (C) 2013 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{
+  'variables': {
+    're2_dir%': '/usr/include',
+    're2_lib%': '/usr/lib/libre2.a',
+  },
+  'targets': [
+    {
+      'target_name': 're2',
+      'type': 'none',
+      'all_dependent_settings': {
+        'include_dirs': [
+          '<(re2_dir)',
+        ],
+        'conditions': [
+          ['"<(component)" != "shared_library"', {
+            'libraries': [
+              '<(re2_lib)',
+            ],
+          }],
+        ],
+      },
+    },
+  ],
+}
diff --git a/chromium/third_party/libaddressinput/libaddressinput.gyp b/chromium/third_party/libaddressinput/libaddressinput.gyp
index a668d0878a9..fc3fb930811 100644
--- a/chromium/third_party/libaddressinput/libaddressinput.gyp
+++ b/chromium/third_party/libaddressinput/libaddressinput.gyp
@@ -14,19 +14,23 @@
         },
       }],
     ],
+    'defines': [
+      'CUSTOM_BASICTYPES="base/basictypes.h"',
+      'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"',
+    ],
   },
   'targets': [
     {
-      'target_name': 'generated_messages',
+      'target_name': 'libaddressinput_strings',
       'type': 'none',
       'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/',
       },
       'actions': [
         {
-          'action_name': 'generate_messages',
+          'action_name': 'libaddressinput_strings',
           'variables': {
-            'grit_grd_file': '<(libaddressinput_dir)/cpp/res/messages.grd',
+            'grit_grd_file': '<(libaddressinput_dir)/cpp/res/libaddressinput_strings.grd',
           },
           'includes': [
             '../../build/grit_action.gypi',
@@ -38,61 +42,127 @@
       ],
     },
     {
-      'target_name': 'libaddressinput',
+      'target_name': 'libaddressinput_updated_strings',
+      'type': 'none',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/',
+      },
+      'actions': [
+        {
+          'action_name': 'libaddressinput_updated_strings',
+          'variables': {
+            'grit_grd_file': '../../chrome/app/address_input_strings.grd',
+          },
+          'includes': [
+            '../../build/grit_action.gypi',
+          ],
+        },
+      ],
+      'includes': [
+        '../../build/grit_target.gypi',
+      ],
+    },
+    # This target provides basic functionality which is cooked into the build.
+    { 'target_name': 'libaddressinput_util',
       'type': 'static_library',
       'include_dirs': [
         '<(libaddressinput_dir)/cpp/include/',
         '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
       ],
       'sources': [
+        'chromium/canonicalize_string.cc',
         'chromium/json.cc',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_data.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_field.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/basictypes.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/move.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/scoped_ptr.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/template_util.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h',
+        '<(libaddressinput_dir)/cpp/src/address_data.cc',
+        '<(libaddressinput_dir)/cpp/src/address_field.cc',
+        '<(libaddressinput_dir)/cpp/src/region_data_constants.cc',
+        '<(libaddressinput_dir)/cpp/src/region_data_constants.h',
+        '<(libaddressinput_dir)/cpp/src/rule.cc',
+        '<(libaddressinput_dir)/cpp/src/rule.h',
+        '<(libaddressinput_dir)/cpp/src/util/canonicalize_string.h',
+        '<(libaddressinput_dir)/cpp/src/util/json.h',
+        '<(libaddressinput_dir)/cpp/src/util/stl_util.h',
+        '<(libaddressinput_dir)/cpp/src/util/string_util.cc',
+        '<(libaddressinput_dir)/cpp/src/util/string_util.h',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/re2/re2.gyp:re2',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          'CUSTOM_BASICTYPES="base/basictypes.h"',
+          'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"',
+        ],
+        'include_dirs': [
+          '<(libaddressinput_dir)/cpp/include/',
+        ],
+      },
+    },
+    # This target provides more complicated functionality like pinging servers
+    # for validation rules.
+    {
+      'target_name': 'libaddressinput',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(libaddressinput_dir)/cpp/include/',
+        '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
+      ],
+      'sources': [
+        'chromium/chrome_downloader_impl.cc',
+        'chromium/chrome_downloader_impl.h',
+        'chromium/chrome_storage_impl.cc',
+        'chromium/chrome_storage_impl.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui_component.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_validator.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/load_rules_delegate.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/localization.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/util/template_util.h',
-        '<(libaddressinput_dir)/cpp/src/address_field.cc',
-        '<(libaddressinput_dir)/cpp/src/address_field_util.cc',
-        '<(libaddressinput_dir)/cpp/src/address_field_util.h',
         '<(libaddressinput_dir)/cpp/src/address_problem.cc',
         '<(libaddressinput_dir)/cpp/src/address_ui.cc',
         '<(libaddressinput_dir)/cpp/src/address_validator.cc',
+        '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.cc',
+        '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.h',
+        '<(libaddressinput_dir)/cpp/src/fallback_data_store.cc',
+        '<(libaddressinput_dir)/cpp/src/fallback_data_store.h',
         '<(libaddressinput_dir)/cpp/src/grit.h',
-        '<(libaddressinput_dir)/cpp/src/localization.cc',
-        '<(libaddressinput_dir)/cpp/src/lookup_key_util.cc',
-        '<(libaddressinput_dir)/cpp/src/lookup_key_util.h',
-        '<(libaddressinput_dir)/cpp/src/region_data_constants.cc',
-        '<(libaddressinput_dir)/cpp/src/region_data_constants.h',
         '<(libaddressinput_dir)/cpp/src/retriever.cc',
         '<(libaddressinput_dir)/cpp/src/retriever.h',
-        '<(libaddressinput_dir)/cpp/src/rule.cc',
-        '<(libaddressinput_dir)/cpp/src/rule.h',
-        '<(libaddressinput_dir)/cpp/src/rule_retriever.cc',
-        '<(libaddressinput_dir)/cpp/src/rule_retriever.h',
-        '<(libaddressinput_dir)/cpp/src/util/json.h',
+        '<(libaddressinput_dir)/cpp/src/ruleset.cc',
+        '<(libaddressinput_dir)/cpp/src/ruleset.h',
         '<(libaddressinput_dir)/cpp/src/util/md5.cc',
         '<(libaddressinput_dir)/cpp/src/util/md5.h',
-        '<(libaddressinput_dir)/cpp/src/util/string_split.cc',
-        '<(libaddressinput_dir)/cpp/src/util/string_split.h',
-        '<(libaddressinput_dir)/cpp/src/validating_storage.cc',
-        '<(libaddressinput_dir)/cpp/src/validating_storage.h',
-        '<(libaddressinput_dir)/cpp/src/validating_util.cc',
-        '<(libaddressinput_dir)/cpp/src/validating_util.h',
+        '<(libaddressinput_dir)/cpp/src/util/trie.cc',
+        '<(libaddressinput_dir)/cpp/src/util/trie.h',
       ],
       'defines': [
-        'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-address/"',
+        'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"',
       ],
       'dependencies': [
-        'generated_messages',
+        'libaddressinput_strings',
+        'libaddressinput_updated_strings',
+        'libaddressinput_util',
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/re2/re2.gyp:re2',
       ],
       'direct_dependent_settings': {
+        'defines': [
+          'CUSTOM_BASICTYPES="base/basictypes.h"',
+          'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"',
+        ],
         'include_dirs': [
           '<(libaddressinput_dir)/cpp/include/',
         ],
@@ -102,38 +172,48 @@
       'target_name': 'libaddressinput_unittests',
       'type': '<(gtest_target_type)',
       'include_dirs': [
+        '<(DEPTH)',
         '<(libaddressinput_dir)/cpp/src/',
         '<(DEPTH)/testing/gtest/include/',
         '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
       ],
       'sources': [
-        '<(libaddressinput_dir)/cpp/test/address_field_util_test.cc',
+        'chromium/chrome_downloader_impl_unittest.cc',
+        'chromium/chrome_rule_test.cc',
+        'chromium/chrome_storage_impl_unittest.cc',
+        '<(libaddressinput_dir)/cpp/test/address_data_test.cc',
         '<(libaddressinput_dir)/cpp/test/address_ui_test.cc',
+        '<(libaddressinput_dir)/cpp/test/address_validator_test.cc',
+        '<(libaddressinput_dir)/cpp/test/country_rules_aggregator_test.cc',
+        '<(libaddressinput_dir)/cpp/test/countryinfo_example_addresses_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.h',
         '<(libaddressinput_dir)/cpp/test/fake_downloader_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_storage.cc',
         '<(libaddressinput_dir)/cpp/test/fake_storage.h',
         '<(libaddressinput_dir)/cpp/test/fake_storage_test.cc',
-        '<(libaddressinput_dir)/cpp/test/localization_test.cc',
-        '<(libaddressinput_dir)/cpp/test/lookup_key_util_test.cc',
+        '<(libaddressinput_dir)/cpp/test/fallback_data_store_test.cc',
         '<(libaddressinput_dir)/cpp/test/region_data_constants_test.cc',
         '<(libaddressinput_dir)/cpp/test/retriever_test.cc',
-        '<(libaddressinput_dir)/cpp/test/rule_retriever_test.cc',
         '<(libaddressinput_dir)/cpp/test/rule_test.cc',
+        '<(libaddressinput_dir)/cpp/test/storage_test_runner.cc',
+        '<(libaddressinput_dir)/cpp/test/storage_test_runner.h',
         '<(libaddressinput_dir)/cpp/test/util/json_test.cc',
         '<(libaddressinput_dir)/cpp/test/util/md5_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/scoped_ptr_unittest.cc',
-        '<(libaddressinput_dir)/cpp/test/util/string_split_unittest.cc',
-        '<(libaddressinput_dir)/cpp/test/validating_storage_test.cc',
-        '<(libaddressinput_dir)/cpp/test/validating_util_test.cc',
+        '<(libaddressinput_dir)/cpp/test/util/stl_util_unittest.cc',
+        '<(libaddressinput_dir)/cpp/test/util/string_util_test.cc',
+        '<(libaddressinput_dir)/cpp/test/util/trie_test.cc',
       ],
       'defines': [
         'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
       ],
       'dependencies': [
         'libaddressinput',
+        'libaddressinput_strings',
+        '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
+        '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
     },