Rename Artwork to MediaImage on the Java side

content/common/android/media_metadata_android.cc

 // Copyright 2016 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 "content/common/android/media_metadata_android.h"
 
 #include <string>
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ skipping 26 matching lines @@
   ScopedJavaLocalRef<jstring> j_title(
       base::android::ConvertUTF16ToJavaString(env, metadata.title));
   ScopedJavaLocalRef<jstring> j_artist(
       base::android::ConvertUTF16ToJavaString(env, metadata.artist));
   ScopedJavaLocalRef<jstring> j_album(
       base::android::ConvertUTF16ToJavaString(env, metadata.album));
 
   ScopedJavaLocalRef<jobject> j_metadata =
       Java_MediaMetadata_create(env, j_title, j_artist, j_album);
 
-  for (const auto& artwork : metadata.artwork) {
-    std::string src = artwork.src.spec();
+  for (const auto& image : metadata.artwork) {
+    std::string src = image.src.spec();
     ScopedJavaLocalRef<jstring> j_src(
         base::android::ConvertUTF8ToJavaString(env, src));
     ScopedJavaLocalRef<jstring> j_type(
-        base::android::ConvertUTF16ToJavaString(env, artwork.type));
+        base::android::ConvertUTF16ToJavaString(env, image.type));
     ScopedJavaLocalRef<jintArray> j_sizes(
-        base::android::ToJavaIntArray(
-            env, GetFlattenedSizeArray(artwork.sizes)));
+        base::android::ToJavaIntArray(env, GetFlattenedSizeArray(image.sizes)));
 
-    Java_MediaMetadata_createAndAddArtwork(env, j_metadata, j_src, j_type,
-                                           j_sizes);
+    Java_MediaMetadata_createAndAddMediaImage(env, j_metadata, j_src, j_type,
+                                              j_sizes);
   }
 
   return j_metadata;
 }
 
 }  // namespace content