commit b2df76ea8fec9e32f6f3718986dba0d95315b29c
author Torne (Richard Coles) <torne@google.com> Mon May 13 16:52:09 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon May 13 16:52:09 2013 +0100
tree 0182623e854b794f7307829abf4be16435a0193a
parent 121d6d4bf5931d9b1dbc0b9a262f6c609440f6c7

Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9

chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 1b50b43..d1dcc27 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -295,6 +295,8 @@
         'common/extensions/permissions/permission_message.h',
         'common/extensions/permissions/permission_set.cc',
         'common/extensions/permissions/permission_set.h',
+        'common/extensions/permissions/permissions_data.cc',
+        'common/extensions/permissions/permissions_data.h',
         'common/extensions/permissions/permissions_info.cc',
         'common/extensions/permissions/permissions_info.h',
         'common/extensions/permissions/set_disjunction_permission.h',
@@ -415,8 +417,8 @@
         'common/url_constants.cc',
         'common/url_constants.h',
         'common/validation_message_messages.h',
-        'common/web_apps.cc',
-        'common/web_apps.h',
+        'common/web_application_info.cc',
+        'common/web_application_info.h',
         'common/web_resource/web_resource_unpacker.cc',
         'common/web_resource/web_resource_unpacker.h',
         'common/worker_thread_ticker.cc',
@@ -744,6 +746,7 @@
         'common/metrics/proto/histogram_event.proto',
         'common/metrics/proto/omnibox_event.proto',
         'common/metrics/proto/perf_data.proto',
+        'common/metrics/proto/permuted_entropy_cache.proto',
         'common/metrics/proto/profiler_event.proto',
         'common/metrics/proto/system_profile.proto',
         'common/metrics/proto/user_action_event.proto',