Reapply "Media Galleries API Metadata: Image metadata"

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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/auto_reset.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 354 matching lines @@
                                   xml_contents.c_str(), xml_contents.size()));
   }
 #endif  // defined(OS_MACOSX)
 
   base::FilePath GetCommonDataDir() const {
     return test_data_dir_.AppendASCII("api_test")
                          .AppendASCII("media_galleries")
                          .AppendASCII("common");
   }
 
+  base::FilePath GetWallpaperTestDataDir() const {
+    return test_data_dir_.AppendASCII("api_test")
+                         .AppendASCII("wallpaper");
+  }
+
   int num_galleries() const {
     return ensure_media_directories_exists_->num_galleries();
   }
 
   int test_jpg_size() const { return test_jpg_size_; }
 
   EnsureMediaDirectoriesExists* ensure_media_directories_exists() const {
     return ensure_media_directories_exists_.get();
   }
 
@@ skipping 215 matching lines @@
 
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("tourl", custom_args)) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, GetMetadata) {
   RemoveAllGalleries();
   MakeSingleFakeGallery(NULL);
 
   AddFileToSingleFakeGallery(media::GetTestDataFilePath("90rotation.mp4"));
   AddFileToSingleFakeGallery(media::GetTestDataFilePath("id3_png_test.mp3"));
+  AddFileToSingleFakeGallery(GetWallpaperTestDataDir().AppendASCII("test.jpg"));
 
   base::ListValue custom_args;
 #if defined(USE_PROPRIETARY_CODECS)
   custom_args.AppendBoolean(true);
 #else
   custom_args.AppendBoolean(false);
 #endif
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
       << message_;
 }