Massive refactor of the Android invalidation code.

components/test/run_all_unittests.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "url/url_util.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/bundle_locations.h"
 #endif
 
 #if !defined(OS_IOS)
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
+#include "components/invalidation/android/component_jni_registrar.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
 namespace {
 
 class ComponentsTestSuite : public base::TestSuite {
  public:
   ComponentsTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  private:
   virtual void Initialize() OVERRIDE {
     base::TestSuite::Initialize();
 
     // Initialize the histograms subsystem, so that any histograms hit in tests
     // are correctly registered with the statistics recorder and can be queried
     // by tests.
     base::StatisticsRecorder::Initialize();
 
 #if !defined(OS_IOS)
     gfx::GLSurface::InitializeOneOffForTests();
 #endif
 #if defined(OS_ANDROID)
     // Register JNI bindings for android.
     JNIEnv* env = base::android::AttachCurrentThread();
     gfx::android::RegisterJni(env);
     ui::android::RegisterJni(env);
+    invalidation::android::RegisterInvalidationJni(env);
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
     // Look in the framework bundle for resources.
     base::FilePath path;
     PathService::Get(base::DIR_EXE, &path);
 
     // TODO(tfarina): This is temporary. The right fix is to write a
     // framework-Info.plist and integrate that into the build.
     // Hardcode the framework name here to avoid having to depend on chrome's
@@ skipping 73 matching lines @@
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }