Massive refactor of the Android invalidation code.

chrome/browser/invalidation/invalidation_controller_android.cc

Index: chrome/browser/invalidation/invalidation_controller_android.cc
diff --git a/chrome/browser/invalidation/invalidation_controller_android.cc b/chrome/browser/invalidation/invalidation_controller_android.cc
deleted file mode 100644
index 021027c4d0c0bf6fdfdad7d285ecc76e1ea0c320..0000000000000000000000000000000000000000
--- a/chrome/browser/invalidation/invalidation_controller_android.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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.
-
-#include "chrome/browser/invalidation/invalidation_controller_android.h"
-
-#include <string>
-#include <vector>
-
-#include "base/android/jni_array.h"
-#include "chrome/jni/InvalidationController_jni.h"
-#include "google/cacheinvalidation/include/types.h"
-
-namespace invalidation {
-
-InvalidationControllerAndroid::InvalidationControllerAndroid() {}
-
-InvalidationControllerAndroid::~InvalidationControllerAndroid() {}
-
-void InvalidationControllerAndroid::SetRegisteredObjectIds(
-    const syncer::ObjectIdSet& ids) {
-  // Get a reference to the Java invalidation controller.
-  JNIEnv* env = base::android::AttachCurrentThread();
-  DCHECK(env);
-  if (invalidation_controller_.is_null()) {
-    invalidation_controller_.Reset(Java_InvalidationController_get(
-        env,
-        base::android::GetApplicationContext()));
-  }
-
-  // To call the corresponding method on the Java invalidation controller, split
-  // the object ids into object source and object name arrays.
-  std::vector<int> sources;
-  std::vector<std::string> names;
-  syncer::ObjectIdSet::const_iterator id;
-  for (id = ids.begin(); id != ids.end(); ++id) {
-    sources.push_back(id->source());
-    names.push_back(id->name());
-  }
-
-  Java_InvalidationController_setRegisteredObjectIds(
-      env,
-      invalidation_controller_.obj(),
-      base::android::ToJavaIntArray(env, sources).obj(),
-      base::android::ToJavaArrayOfStrings(env, names).obj());
-}
-
-std::string InvalidationControllerAndroid::GetInvalidatorClientId() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  DCHECK(env);
-  if (invalidation_controller_.is_null()) {
-    invalidation_controller_.Reset(Java_InvalidationController_get(
-        env,
-        base::android::GetApplicationContext()));
-  }
-
-  // Ask the Java code to for the invalidator ID it's currently using.
-  base::android::ScopedJavaLocalRef<_jbyteArray*> id_bytes_java =
-      Java_InvalidationController_getInvalidatorClientId(
-          env,
-          invalidation_controller_.obj());
-
-  // Convert it into a more convenient format for C++.
-  std::vector<uint8_t> id_bytes;
-  base::android::JavaByteArrayToByteVector(env, id_bytes_java.obj(), &id_bytes);
-  std::string id(id_bytes.begin(), id_bytes.end());
-
-  return id;
-}
-
-bool RegisterInvalidationController(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-} //  namespace invalidation