| Index: chrome/browser/android/favicon_helper.cc
|
| diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc
|
| index 273d339ef5d0c05527dd2d8789644bad9dbd0bb4..588072529fcb92d54ae10c4f1bb7e0af9039c03d 100644
|
| --- a/chrome/browser/android/favicon_helper.cc
|
| +++ b/chrome/browser/android/favicon_helper.cc
|
| @@ -64,10 +64,8 @@ void OnLocalFaviconAvailable(
|
| }
|
|
|
| // Call java side OnLocalFaviconAvailable method.
|
| - Java_FaviconImageCallback_onFaviconAvailable(env,
|
| - j_favicon_image_callback->obj(),
|
| - j_favicon_bitmap.obj(),
|
| - j_icon_url.obj());
|
| + Java_FaviconImageCallback_onFaviconAvailable(
|
| + env, j_favicon_image_callback->obj(), j_favicon_bitmap, j_icon_url);
|
| }
|
|
|
| size_t GetLargestSizeIndex(const std::vector<gfx::Size>& sizes) {
|
| @@ -107,7 +105,7 @@ void OnFaviconDownloaded(
|
|
|
| JNIEnv* env = AttachCurrentThread();
|
| Java_IconAvailabilityCallback_onIconAvailabilityChecked(
|
| - env, j_availability_callback.obj(), success);
|
| + env, j_availability_callback, success);
|
| }
|
|
|
| void OnFaviconImageResultAvailable(
|
| @@ -123,7 +121,7 @@ void OnFaviconImageResultAvailable(
|
| if (!result.image.IsEmpty()) {
|
| JNIEnv* env = AttachCurrentThread();
|
| Java_IconAvailabilityCallback_onIconAvailabilityChecked(
|
| - env, j_availability_callback.obj(), false);
|
| + env, j_availability_callback, false);
|
| return;
|
| }
|
|
|
|
|