Revert of [DevTools] Consolidate overlay-related functionality in Overlay domain

third_party/WebKit/Source/web/WebDevToolsAgentImpl.h

Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
index a42daf4c4d54b975453601391dfae41db225702e..d37a8e413d76f8320a7cc193ca6f1430bd7fb526 100644
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.h
@@ -48,7 +48,7 @@
 
 class GraphicsLayer;
 class InspectedFrames;
-class InspectorOverlayAgent;
+class InspectorOverlay;
 class InspectorResourceContainer;
 class InspectorResourceContentLoader;
 class InspectorTraceEvents;
@@ -74,7 +74,7 @@
 
   void WillBeDestroyed();
   WebDevToolsAgentClient* Client() { return client_; }
-  InspectorOverlayAgent* OverlayAgent() const { return overlay_agent_.Get(); }
+  InspectorOverlay* Overlay() const { return overlay_.Get(); }
   void FlushProtocolNotifications();
 
   // Instrumentation from web/ layer.
@@ -105,6 +105,7 @@
  private:
   WebDevToolsAgentImpl(WebLocalFrameImpl*,
                        WebDevToolsAgentClient*,
+                       InspectorOverlay*,
                        bool include_view_agents);
 
   // InspectorTracingAgent::Client implementation.
@@ -118,6 +119,7 @@
 
   // InspectorPageAgent::Client implementation.
   void PageLayoutInvalidated(bool resized) override;
+  void ConfigureOverlay(bool suspended, const String& message) override;
   void WaitForCreateWindow(LocalFrame*) override;
 
   // InspectorSession::Client implementation.
@@ -148,15 +150,16 @@
 
   Member<CoreProbeSink> instrumenting_agents_;
   Member<InspectorResourceContentLoader> resource_content_loader_;
+  Member<InspectorOverlay> overlay_;
   Member<InspectedFrames> inspected_frames_;
   Member<InspectorResourceContainer> resource_container_;
 
+  Member<InspectorDOMAgent> dom_agent_;
   Member<InspectorPageAgent> page_agent_;
   Member<InspectorNetworkAgent> network_agent_;
   Member<InspectorLayerTreeAgent> layer_tree_agent_;
   Member<InspectorTracingAgent> tracing_agent_;
   Member<InspectorTraceEvents> trace_events_agent_;
-  Member<InspectorOverlayAgent> overlay_agent_;
 
   Member<InspectorSession> session_;
   bool include_view_agents_;