Revert of Reapply "Media Galleries API Metadata: Image metadata" (htt…

…ps://codereview.chromium.org/216443005/) Reason for revert: Breaking Mac 10.6 release testers. (no idea why, but it is) Original issue's description: > Reapply "Media Galleries API Metadata: Image metadata" > > Original patch (also PS1) https://codereview.chromium.org/191583002 > > CQ can't catch the breakages of this patch. > > TBR= > BUG=318450 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261864 TBR=ccameron@chromium.org,thestig@chromium.org,grt@chromium.org NOTREECHECKS=true NOTRY=true BUG=318450 Review URL: https://codereview.chromium.org/225023014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261895 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Apr 4, 2014 · e016805 · e016805
1 parent fba56f6
commit e016805
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 605 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -2239,14 +2239,6 @@
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
-      ['OS=="mac"', {
-        'xcode_settings': {
-          'LD_RUNPATH_SEARCH_PATHS': [
-            # To find dylibs such as libexif.
-            '@loader_path/.',
-          ],
-        },
-      }],
       ['OS=="mac" and component=="shared_library"', {
         'xcode_settings': {
           'DYLIB_INSTALL_NAME_BASE': '@rpath',

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -372,11 +372,6 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest {
                          .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();
   }
@@ -612,7 +607,6 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowserTest, GetMetadata) {
 
   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)

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -250,7 +250,6 @@
             '../content/content.gyp:content_utility',
             '../media/media.gyp:media',
             '../skia/skia.gyp:skia',
-            '../third_party/libexif/libexif.gyp:libexif',
             '../third_party/libxml/libxml.gyp:libxml',
             'common',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
@@ -297,8 +296,6 @@
             'utility/importer/nss_decryptor_win.h',
             'utility/importer/safari_importer.h',
             'utility/importer/safari_importer.mm',
-            'utility/media_galleries/image_metadata_extractor.cc',
-            'utility/media_galleries/image_metadata_extractor.h',
             'utility/media_galleries/ipc_data_source.cc',
             'utility/media_galleries/ipc_data_source.h',
             'utility/media_galleries/itunes_pref_parser_win.cc',
@@ -359,9 +356,6 @@
               ],
             }],
             ['OS=="android"', {
-              'dependencies!': [
-                '../third_party/libexif/libexif.gyp:libexif',
-              ],
               'sources/': [
                 ['exclude', '^utility/importer/'],
                 ['exclude', '^utility/media_galleries/'],

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
@@ -45,7 +45,6 @@
         ],
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/libexif.dylib',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
@@ -65,7 +64,6 @@
           '<(PRODUCT_DIR)/d3dcompiler_46.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
-          '<(PRODUCT_DIR)/libexif.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
           '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/osmesa.dll',

diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
@@ -37,10 +37,6 @@
         '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(WRAPPER_NAME)/$(PRODUCT_NAME)',
 
     'INFOPLIST_FILE': 'app/framework-Info.plist',
-    'LD_RUNPATH_SEARCH_PATHS': [
-      # To find dylibs such as libexif.
-      '@loader_path/Libraries/.',
-    ],
   },
   'includes': [
     'chrome_nibs.gypi',
@@ -142,10 +138,10 @@
   ],
   'copies': [
     {
+      # Copy FFmpeg binaries for audio/video support.
       'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
       'files': [
-        '<(PRODUCT_DIR)/ffmpegsumo.so', # Copy FFmpeg binaries for audio/video support.
-        '<(PRODUCT_DIR)/libexif.dylib',
+        '<(PRODUCT_DIR)/ffmpegsumo.so',
       ],
     },
     {

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
@@ -1944,7 +1944,6 @@
         'utility/importer/firefox_importer_unittest_utils.h',
         'utility/importer/firefox_importer_unittest_utils_mac.cc',
         'utility/importer/safari_importer_unittest.mm',
-        'utility/media_galleries/image_metadata_extractor_unittest.cc',
 
         # Duplicate these tests here because PathService has more items in
         # unit_tests than in base_unittests.
@@ -2615,7 +2614,6 @@
             ['exclude', '^browser/ui/webui/sync_promo'],
             ['exclude', '^tools/profile_reset/'],
             ['exclude', '^utility/importer/'],
-            ['exclude', '^utility/media_galleries/'],
           ],
           'conditions': [
             ['gtest_target_type == "shared_library"', {

diff --git a/chrome/common/extensions/api/media_galleries.idl b/chrome/common/extensions/api/media_galleries.idl
@@ -104,26 +104,13 @@ namespace mediaGalleries {
     long? height;
     long? width;
 
-    // Defined for images only.
-    double? xResolution;
-    double? yResolution;
-
     // Defined for audio and video. In seconds.
     double? duration;
 
     // Defined for images and video. In degrees.
     long? rotation;
 
-    // Defined for images only.
-    DOMString? cameraMake;
-    DOMString? cameraModel;
-    double? exposureTimeSeconds;
-    boolean? flashFired;
-    double? fNumber;
-    double? focalLengthMm;
-    double? isoEquivalent;
-
-    // Defined for audio and video only.
+    // Generic metadata tags.
     DOMString? album;
     DOMString? artist;
     DOMString? comment;

diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps
@@ -5,7 +5,6 @@ libcairo2 (>= 1.6.0)
 libcap2 (>= 2.10)
 libcups2 (>= 1.4.0)
 libdbus-1-3 (>= 1.2.14)
-libexif12
 libexpat1 (>= 1.95.8)
 libfontconfig1 (>= 2.8.0)
 libfreetype6 (>= 2.3.9)

diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
@@ -24,7 +24,6 @@ libdbus-1.so.3
 libdl.so.2
 libdl.so.2(GLIBC_2.0)
 libdl.so.2(GLIBC_2.1)
-libexif.so.12
 libexpat.so.1
 libfontconfig.so.1
 libfreetype.so.6

diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -19,7 +19,6 @@ libcups.so.2()(64bit)
 libdbus-1.so.3()(64bit)
 libdl.so.2()(64bit)
 libdl.so.2(GLIBC_2.2.5)(64bit)
-libexif.so.12()(64bit)
 libexpat.so.1()(64bit)
 libfontconfig.so.1()(64bit)
 libfreetype.so.6()(64bit)

diff --git a/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64 b/chrome/installer/linux/sysroot_scripts/packagelist.debian.wheezy.amd64
@@ -61,8 +61,6 @@ main/libc/libcap2/libcap-dev_2.22-1.2_amd64.deb
 main/libe/libexif/libexif12_0.6.20-3_amd64.deb
 main/libe/libexif/libexif-dev_0.6.20-3_amd64.deb
 main/libf/libffi/libffi5_3.0.10-3_amd64.deb
-main/libe/libexif/libexif12_0.6.20-3_amd64.deb
-main/libe/libexif/libexif-dev_0.6.20-3_amd64.deb
 main/libg/libgcrypt11/libgcrypt11_1.5.0-5+deb7u1_amd64.deb
 main/libg/libgcrypt11/libgcrypt11-dev_1.5.0-5+deb7u1_amd64.deb
 main/libg/libgnome-keyring/libgnome-keyring0_3.4.1-1_amd64.deb

diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
@@ -28,7 +28,6 @@ ffmpegsumo.dll: %(VersionDir)s\
 icudt.dll: %(VersionDir)s\
 icudtl.dat: %(VersionDir)s\
 libEGL.dll: %(VersionDir)s\
-libexif.dll: %(VersionDir)s\
 libGLESv2.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\
 nacl_irt_x86_32.nexe: %(VersionDir)s\

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
@@ -57,7 +57,6 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/libexif.dylib',
           '<(PRODUCT_DIR)/osmesa.so',
         ],
         'isolate_dependency_untracked': [
@@ -84,7 +83,6 @@
           '<(PRODUCT_DIR)/d3dcompiler_46.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
-          '<(PRODUCT_DIR)/libexif.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
           '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
           '<(PRODUCT_DIR)/osmesa.dll',

diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
@@ -56,7 +56,6 @@
         ],
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/libexif.dylib',
         ],
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',

diff --git a/chrome/test/data/extensions/api_test/media_galleries/media_metadata/test.js b/chrome/test/data/extensions/api_test/media_galleries/media_metadata/test.js
@@ -32,27 +32,6 @@ function ImageMIMETypeOnlyTest() {
   RunMetadataTest("test.jpg", {metadataType: 'mimeTypeOnly'}, verifyMetadata);
 }
 
-function ImageTagsTest() {
-  function verifyMetadata(metadata) {
-    chrome.test.assertEq("image/jpeg", metadata.mimeType);
-    chrome.test.assertEq(5616, metadata.width);
-    chrome.test.assertEq(3744, metadata.height);
-    chrome.test.assertEq(0, metadata.rotation);
-    chrome.test.assertEq(300.0, metadata.xResolution);
-    chrome.test.assertEq(300.0, metadata.yResolution);
-    chrome.test.assertEq("Canon", metadata.cameraMake);
-    chrome.test.assertEq("Canon EOS 5D Mark II", metadata.cameraModel);
-    chrome.test.assertEq(0.01, metadata.exposureTimeSeconds);
-    chrome.test.assertFalse(metadata.flashFired);
-    chrome.test.assertEq(3.2, metadata.fNumber);
-    chrome.test.assertEq(100, metadata.focalLengthMm);
-    chrome.test.assertEq(1600, metadata.isoEquivalent);
-    chrome.test.succeed();
-  }
-
-  RunMetadataTest("test.jpg", {}, verifyMetadata);
-}
-
 function MP3MIMETypeOnlyTest() {
   function verifyMetadata(metadata) {
     chrome.test.assertEq("audio/mpeg", metadata.mimeType);
@@ -113,8 +92,7 @@ chrome.test.getConfig(function(config) {
 
   // Should still be able to sniff MP3 MIME type without proprietary codecs.
   var testsToRun = [
-    ImageMIMETypeOnlyTest,
-    ImageTagsTest
+    ImageMIMETypeOnlyTest
   ];
 
   if (useProprietaryCodecs) {

diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
@@ -56,10 +56,6 @@ FILES = [
     'filename': 'libffmpegsumo.so',
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'lib/libexif.so',
-    'buildtype': ['dev', 'official'],
-  },
   {
     'filename': 'lib/libpeerconnection.so',
     'buildtype': ['dev', 'official'],

diff --git a/chrome/tools/build/mac/TESTS b/chrome/tools/build/mac/TESTS
@@ -1,3 +1,2 @@
 sync_integration_tests
 ffmpegsumo.so
-libexif.dylib
diff --git a/chrome/tools/build/mac/dump_product_syms b/chrome/tools/build/mac/dump_product_syms
@@ -82,7 +82,6 @@ SRC_NAMES=(
     "crash_inspector"
     "crash_report_sender.app"
     "ffmpegsumo.so"
-    "libexif.dylib"
     "libplugin_carbon_interpose.dylib"
     "ppGoogleNaClPluginChrome.plugin"
     "remoting_host_plugin.plugin"

diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
@@ -99,11 +99,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
   },
-  {
-    'filename': 'libexif.dll',
-    'buildtype': ['dev', 'official'],
-    'filegroup': ['default', 'symsrc'],
-  },
   {
     'filename': 'libpeerconnection.dll',
     'buildtype': ['dev', 'official'],

diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
@@ -83,7 +83,6 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.so',
-          '<(PRODUCT_DIR)/libexif.dylib',
           '<(PRODUCT_DIR)/osmesa.so',
         ],
         'isolate_dependency_untracked': [
@@ -112,7 +111,6 @@
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
-          '<(PRODUCT_DIR)/libexif.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
         ],
         'isolate_dependency_untracked': [