Revert of Move ObjectContentType entirely to HTMLPlugInElement

third_party/WebKit/Source/core/html/HTMLPlugInElement.h

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.h b/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
index 924973f5efd18dc4901be643b94e48bab447a69e..9eb7fa5ed2166583ff368e1a36dc3fb31a4f5117 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
@@ -106,10 +106,19 @@
   virtual LayoutEmbeddedContent* LayoutEmbeddedContentForJSBindings() const;
 
   bool IsImageType();
+  bool ShouldPreferPlugInsForImages() const {
+    return should_prefer_plug_ins_for_images_;
+  }
   LayoutEmbeddedItem GetLayoutEmbeddedItem() const;
   bool AllowedToLoadFrameURL(const String& url);
-  bool RequestObject(const Vector<String>& param_names,
+  bool RequestObject(const String& url,
+                     const String& mime_type,
+                     const Vector<String>& param_names,
                      const Vector<String>& param_values);
+  bool ShouldUsePlugin(const KURL&,
+                       const String& mime_type,
+                       bool has_fallback,
+                       bool& use_fallback);
 
   void DispatchErrorEvent();
   bool IsErrorplaceholder();
@@ -164,18 +173,13 @@
   bool AllowedToLoadPlugin(const KURL&, const String& mime_type);
   // Perform checks based on the URL and MIME-type of the object to load.
   bool AllowedToLoadObject(const KURL&, const String& mime_type);
-
-  enum class ObjectContentType {
-    kNone,
-    kImage,
-    kFrame,
-    kPlugin,
-  };
-  ObjectContentType GetObjectContentType();
+  bool WouldLoadAsNetscapePlugin(const String& url, const String& service_type);
 
   void SetPersistedPlugin(PluginView*);
 
-  bool RequestObjectInternal(const Vector<String>& param_names,
+  bool RequestObjectInternal(const String& url,
+                             const String& mime_type,
+                             const Vector<String>& param_names,
                              const Vector<String>& param_values);
 
   v8::Global<v8::Object> plugin_wrapper_;