Revert of Move ObjectContentType entirely to HTMLPlugInElement

third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 157 matching lines @@
 
   // Overwrites the URL and MIME type of a Flash embed to use an HTML5 embed.
   KURL overriden_url =
       GetDocument().GetFrame()->Loader().Client()->OverrideFlashEmbedWithHTML(
           GetDocument().CompleteURL(url_));
   if (!overriden_url.IsEmpty()) {
     url_ = overriden_url.GetString();
     service_type_ = "text/html";
   }
 
-  RequestObject(param_names, param_values);
+  RequestObject(url_, service_type_, param_names, param_values);
 }
 
 bool HTMLEmbedElement::LayoutObjectIsNeeded(const ComputedStyle& style) {
   if (IsImageType())
     return HTMLPlugInElement::LayoutObjectIsNeeded(style);
 
   // https://html.spec.whatwg.org/multipage/embedded-content.html#the-embed-element
   // While any of the following conditions are occurring, any plugin
   // instantiated for the element must be removed, and the embed element
   // represents nothing:
@@ skipping 37 matching lines @@
   for (HTMLObjectElement* object =
            Traversal<HTMLObjectElement>::FirstAncestor(*this);
        object; object = Traversal<HTMLObjectElement>::FirstAncestor(*object)) {
     if (object->IsExposed())
       return false;
   }
   return true;
 }
 
 }  // namespace blink