Revert 260917 "Media Galleries API Metadata: Image metadata"

trunk/src/chrome/utility/media_galleries/media_metadata_parser.cc

Index: trunk/src/chrome/utility/media_galleries/media_metadata_parser.cc
===================================================================
--- trunk/src/chrome/utility/media_galleries/media_metadata_parser.cc	(revision 260930)
+++ trunk/src/chrome/utility/media_galleries/media_metadata_parser.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/strings/string_util.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread.h"
-#include "chrome/utility/media_galleries/image_metadata_extractor.h"
 #include "media/base/audio_video_metadata_extractor.h"
 #include "media/base/data_source.h"
 
@@ -21,28 +20,15 @@
 
 void SetStringScopedPtr(const std::string& value,
                         scoped_ptr<std::string>* destination) {
-  DCHECK(destination);
   if (!value.empty())
     destination->reset(new std::string(value));
 }
 
 void SetIntScopedPtr(int value, scoped_ptr<int>* destination) {
-  DCHECK(destination);
   if (value >= 0)
     destination->reset(new int(value));
 }
 
-void SetDoubleScopedPtr(double value, scoped_ptr<double>* destination) {
-  DCHECK(destination);
-  if (value >= 0)
-    destination->reset(new double(value));
-}
-
-void SetBoolScopedPtr(bool value, scoped_ptr<bool>* destination) {
-  DCHECK(destination);
-  destination->reset(new bool(value));
-}
-
 // This runs on |media_thread_|, as the underlying FFmpeg operation is
 // blocking, and the utility thread must not be blocked, so the media file
 // bytes can be sent from the browser process to the utility process.
@@ -50,7 +36,6 @@
     media::DataSource* source,
     scoped_ptr<MediaMetadataParser::MediaMetadata> metadata) {
   DCHECK(source);
-  DCHECK(metadata.get());
   media::AudioVideoMetadataExtractor extractor;
 
   if (!extractor.Extract(source))
@@ -79,39 +64,6 @@
   return metadata.Pass();
 }
 
-void FinishParseImageMetadata(
-    ImageMetadataExtractor* extractor,
-    scoped_ptr<MediaMetadataParser::MediaMetadata> metadata,
-    MediaMetadataParser::MetadataCallback callback,
-    bool extract_success) {
-  DCHECK(extractor);
-  DCHECK(metadata.get());
-
-  if (!extract_success) {
-    callback.Run(metadata.Pass());
-    return;
-  }
-
-  SetIntScopedPtr(extractor->height(), &metadata->height);
-  SetIntScopedPtr(extractor->width(), &metadata->width);
-
-  SetIntScopedPtr(extractor->rotation(), &metadata->rotation);
-
-  SetDoubleScopedPtr(extractor->x_resolution(), &metadata->x_resolution);
-  SetDoubleScopedPtr(extractor->y_resolution(), &metadata->y_resolution);
-  SetBoolScopedPtr(extractor->flash_fired(), &metadata->flash_fired);
-  SetStringScopedPtr(extractor->camera_make(), &metadata->camera_make);
-  SetStringScopedPtr(extractor->camera_model(), &metadata->camera_model);
-  SetDoubleScopedPtr(extractor->exposure_time_sec(),
-                     &metadata->exposure_time_seconds);
-
-  SetDoubleScopedPtr(extractor->f_number(), &metadata->f_number);
-  SetDoubleScopedPtr(extractor->focal_length_mm(), &metadata->focal_length_mm);
-  SetDoubleScopedPtr(extractor->iso_equivalent(), &metadata->iso_equivalent);
-
-  callback.Run(metadata.Pass());
-}
-
 }  // namespace
 
 MediaMetadataParser::MediaMetadataParser(media::DataSource* source,
@@ -138,15 +90,6 @@
     return;
   }
 
-  if (StartsWithASCII(mime_type_, "image/", true)) {
-    ImageMetadataExtractor* extractor = new ImageMetadataExtractor;
-    extractor->Extract(
-        source_,
-        base::Bind(&FinishParseImageMetadata, base::Owned(extractor),
-                   base::Passed(&metadata), callback));
-    return;
-  }
-
   // TODO(tommycli): Implement for image mime types.
   callback.Run(metadata.Pass());
 }