Revert of Fix html_viewer build after latest blink roll

components/html_viewer/html_document.cc

 // Copyright 2014 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 "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 301 matching lines @@
 
     ChildFrameData child_frame_data;
     child_frame_data.view = child_frame_view;
     child_frame_data.scope = scope;
     frame_to_view_[child_frame] = child_frame_data;
   }
   return child_frame;
 }
 
 void HTMLDocument::frameDetached(blink::WebFrame* frame) {
+  frameDetached(frame, DetachType::Remove);
+}
+
+void HTMLDocument::frameDetached(blink::WebFrame* frame, DetachType type) {
+  DCHECK(type == DetachType::Remove);
   if (frame->parent())
     frame->parent()->removeChild(frame);
 
   // |frame| is invalid after here.
   frame->close();
 }
 
 blink::WebCookieJar* HTMLDocument::cookieJar(blink::WebLocalFrame* frame) {
   // TODO(darin): Blink does not fallback to the Platform provided WebCookieJar.
   // Either it should, as it once did, or we should find another solution here.
@@ skipping 97 matching lines @@
     touch_handler_->OnTouchEvent(*event);
     return;
   }
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer