Handle null payload when processing an invalidation on Android.

components/invalidation/impl/invalidation_service_android.cc

 // Copyright 2014 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 "components/invalidation/impl/invalidation_service_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/callback.h"
@@ skipping 136 matching lines @@
       object_invalidation_map.Insert(
           syncer::Invalidation::InitUnknownVersion(object_id));
     } else {
       ObjectIdVersionMap::iterator it =
           max_invalidation_versions_.find(object_id);
       if ((it != max_invalidation_versions_.end()) && (version <= it->second)) {
         DVLOG(1) << "Dropping redundant invalidation with version " << version;
         return;
       }
       max_invalidation_versions_[object_id] = version;
-      object_invalidation_map.Insert(syncer::Invalidation::Init(
-          object_id, version, ConvertJavaStringToUTF8(env, java_payload)));
+      std::string payload;
+      if (!java_payload.is_null())
+        ConvertJavaStringToUTF8(env, java_payload, &payload);
+
+      object_invalidation_map.Insert(
+          syncer::Invalidation::Init(object_id, version, payload));
     }
   }
 
   invalidator_registrar_.DispatchInvalidationsToHandlers(
       object_invalidation_map);
   logger_.OnInvalidation(object_invalidation_map);
 }
 
 // static
 bool InvalidationServiceAndroid::RegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace invalidation