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

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index 535042235d923b729c9cb12e13c1d1789d576d35..64ece9fb37b12ba106c07fa26b7f24a5dfc5dcb9 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -67,7 +67,7 @@
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorWorkerProxyClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
-#include "web/InspectorOverlayAgent.h"
+#include "web/InspectorOverlay.h"
 #include "web/PageOverlay.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
@@ -250,7 +250,7 @@
   if (!local_root_)
     return;
 
-  if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+  if (InspectorOverlay* overlay = GetInspectorOverlay()) {
     overlay->UpdateAllLifecyclePhases();
     // TODO(chrishtr): integrate paint into the overlay's lifecycle.
     if (overlay->GetPageOverlay() &&
@@ -362,7 +362,7 @@
   if (!GetPage())
     return WebInputEventResult::kNotHandled;
 
-  if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+  if (InspectorOverlay* overlay = GetInspectorOverlay()) {
     if (overlay->HandleInputEvent(input_event))
       return WebInputEventResult::kHandledSuppressed;
   }
@@ -1154,11 +1154,11 @@
   return result;
 }
 
-InspectorOverlayAgent* WebFrameWidgetImpl::GetInspectorOverlay() {
+InspectorOverlay* WebFrameWidgetImpl::GetInspectorOverlay() {
   if (!local_root_)
     return nullptr;
   if (WebDevToolsAgentImpl* devtools = local_root_->DevToolsAgentImpl())
-    return devtools->OverlayAgent();
+    return devtools->Overlay();
   return nullptr;
 }