Roll cacheinvalidation DEPS to r339

Changes are needed for Chrome for Android using nano protobufs.

Full list of changes:

r339 Adding forwarding implementation of WakeLockManager in its original location (temporary workaround for Chromium)
r338 * Updating example code to use nano protos instead of lite protos * Addressing Android lint warnings
r337 Removing unused ticl.ProtoWrapper class and moving example code
r336 Android cache invalidation client release August 2014

Depends on https://codereview.chromium.org/532303003/

BUG=377891

Review URL: https://codereview.chromium.org/513293002

Cr-Commit-Position: refs/heads/master@{#293340}

2 files changed, 3 insertions, 31 deletions

diff --git a/third_party/cacheinvalidation/README.chromium b/third_party/cacheinvalidation/README.chromium
index ce5bb62..073b6e2 100644
--- a/third_party/cacheinvalidation/README.chromium
+++ b/third_party/cacheinvalidation/README.chromium
@@ -1,7 +1,7 @@
 Name: Google Cache Invalidation API
 Short Name: google-cache-invalidation-api
 URL: http://code.google.com/p/google-cache-invalidation-api/
-Version: r330
+Version: r339
 License: Apache 2.0
 License File: src/google/cacheinvalidation/COPYING
 Security Critical: no
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 568f402..fcd8368 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -40,7 +40,7 @@
       },
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [4267, ],
-      # channel_common.proto contains definition of ANDROID constant which on 
+      # channel_common.proto contains definition of ANDROID constant which on
       # android build conflicts with compiler option -DANDROID. Remove protos
       # from android build.
       'conditions': [
@@ -199,13 +199,13 @@
           'target_name': 'cacheinvalidation_proto_java',
           'type': 'none',
           'variables': {
+            'proto_runtime': 'nano',
             'proto_in_dir': '../../third_party/cacheinvalidation/src/proto',
           },
           'sources': [
             '<(proto_in_dir)/android_channel.proto',
             '<(proto_in_dir)/android_listener.proto',
             '<(proto_in_dir)/android_service.proto',
-            '<(proto_in_dir)/android_state.proto',
             '<(proto_in_dir)/channel_common.proto',
             '<(proto_in_dir)/client.proto',
             '<(proto_in_dir)/client_protocol.proto',
@@ -215,25 +215,11 @@
           'includes': [ '../../build/protoc_java.gypi' ],
         },
         {
-          'target_name': 'cacheinvalidation_example_proto_java',
-          'type': 'none',
-          'variables': {
-            'cacheinvalidation_in_dir': '../../third_party/cacheinvalidation/src',
-            'proto_in_dir' : '<(cacheinvalidation_in_dir)/java/com/google/ipc/invalidation/examples/android2',
-          },
-          'sources': [
-            '<(proto_in_dir)/example_listener.proto',
-          ],
-          'includes': [ '../../build/protoc_java.gypi' ],
-        },
-        {
           'target_name': 'cacheinvalidation_javalib',
           'type': 'none',
           'dependencies': [
             '../../third_party/android_tools/android_tools.gyp:android_gcm',
             '../../third_party/guava/guava.gyp:guava_javalib',
-            'cacheinvalidation_aidl_javalib',
-            'cacheinvalidation_example_proto_java',
             'cacheinvalidation_proto_java',
           ],
           'variables': {
@@ -242,20 +228,6 @@
           },
           'includes': [ '../../build/java.gypi' ],
         },
-        {
-          'target_name': 'cacheinvalidation_aidl_javalib',
-          'type': 'none',
-          'variables': {
-            # TODO(shashishekhar): aidl_interface_file should be made optional.
-            'aidl_interface_file':'<(android_sdk)/framework.aidl'
-          },
-          'sources': [
-            'src/java/com/google/ipc/invalidation/external/client/android/service/InvalidationService.aidl',
-            'src/java/com/google/ipc/invalidation/external/client/android/service/ListenerService.aidl',
-            'src/java/com/google/ipc/invalidation/testing/android/InvalidationTest.aidl',
-          ],
-          'includes': [ '../../build/java_aidl.gypi' ],
-        },
       ],
     }],
   ],