Roll cacheinvalidation DEPS to r339

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

 // 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.
 
 package org.chromium.sync.notifier;
 
 import android.accounts.Account;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
 import android.content.Intent;
@@ skipping 37 matching lines @@
  * This class is an {@code IntentService}. All methods are assumed to be executing on its single
  * execution thread.
  *
  * @author dsmyers@google.com
  */
 public class InvalidationService extends AndroidListener {
     /* This class must be public because it is exposed as a service. */
 
     /** 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";
 
     private static final Random RANDOM = new Random();
 
     /**
      * Whether the underlying notification client has been started. This boolean is updated when a
      * start or stop intent is issued to the underlying client, not when the intent is actually
      * processed.
      */
@@ skipping 429 matching lines @@
     }
 
     private static void setClientId(byte[] clientId) {
         sClientId = clientId;
     }
 
     private static void setIsClientStarted(boolean isStarted) {
         sIsClientStarted = isStarted;
     }
 }