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}

DEPS

@@ -139,7 +139,7 @@ deps = {
     Var('chromium_git') + '/external/google-safe-browsing/testing.git' + '@' + '9d7e8064f3ca2e45891470c9b5b1dce54af6a9d6',
 
   'src/third_party/cacheinvalidation/src':
-    Var('chromium_git') + '/external/google-cache-invalidation-api/src.git' + '@' + '50c0a8563b62f6e3b780da14f82246d192f9c1e0',
+    Var('chromium_git') + '/external/google-cache-invalidation-api/src.git' + '@' + '108f1459d873db13c1914755a79333a09d4c563f', # from svn revision 339
 
   'src/third_party/leveldatabase/src':
     Var('chromium_git') + '/external/leveldb.git' + '@' + '3f77584eb3f9754bbb7079070873ece3f30a1e6b',

chrome/android/java/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapter.java

@@ -147,7 +147,7 @@ public abstract class ChromiumSyncAdapter extends AbstractThreadedSyncAdapter {
                     // invalidations can be expected to have the objectSource.
                     int resolvedSource = objectSource;
                     if (resolvedSource == 0) {
-                        resolvedSource = Types.ObjectSource.Type.CHROME_SYNC.getNumber();
+                        resolvedSource = Types.ObjectSource.CHROME_SYNC;
                     }
                     Log.v(TAG, "Received sync tickle for " + resolvedSource + " " + objectId + ".");
                     requestSync(resolvedSource, objectId, version, payload);

chrome/android/javatests/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java

@@ -98,8 +98,7 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
         if (withObjectSource) {
             assertEquals(61, mSyncAdapter.mObjectSource);
         } else {
-            assertEquals(Types.ObjectSource.Type.CHROME_SYNC.getNumber(),
-                    mSyncAdapter.mObjectSource);
+            assertEquals(Types.ObjectSource.CHROME_SYNC, mSyncAdapter.mObjectSource);
         }
         assertEquals("objectid_value", mSyncAdapter.mObjectId);
         assertEquals(42, mSyncAdapter.mVersion);

sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java

@@ -117,8 +117,7 @@ public enum ModelType {
      */
     @VisibleForTesting
     public ObjectId toObjectId() {
-        return ObjectId.newInstance(Types.ObjectSource.Type.CHROME_SYNC.getNumber(),
-                mModelType.getBytes());
+        return ObjectId.newInstance(Types.ObjectSource.CHROME_SYNC, mModelType.getBytes());
     }
 
     public static ModelType fromObjectId(ObjectId objectId) {

sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java

@@ -94,7 +94,7 @@ public class InvalidationIntentProtocol {
         ArrayList<Integer> sources = new ArrayList<Integer>();
         ArrayList<String> names = new ArrayList<String>();
         for (int i = 0; i < objectSources.length; i++) {
-            if (objectSources[i] != Types.ObjectSource.Type.CHROME_SYNC.getNumber()) {
+            if (objectSources[i] != Types.ObjectSource.CHROME_SYNC) {
                 sources.add(objectSources[i]);
                 names.add(objectNames[i]);
             }

sync/android/java/src/org/chromium/sync/notifier/InvalidationService.java

@@ -55,7 +55,7 @@ public class InvalidationService extends AndroidListener {
 
     /** Notification client typecode. */
     @VisibleForTesting
-    static final int CLIENT_TYPE = ClientType.Type.CHROME_SYNC_ANDROID_VALUE;
+    static final int CLIENT_TYPE = ClientType.CHROME_SYNC_ANDROID;
 
     private static final String TAG = "InvalidationService";
 

third_party/cacheinvalidation/README.chromium

 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

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',
@@ -214,26 +214,12 @@
           ],
           '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' ],
-        },
       ],
     }],
   ],