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

third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
index 2e2a503fdbf466bfff7842f56f5207405c426db9..428dba6e34f0fefdac734d1683be889c1604841c 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.cpp
@@ -81,6 +81,8 @@
     "pageAgentScriptsToEvaluateOnLoad";
 static const char kScreencastEnabled[] = "screencastEnabled";
 static const char kAutoAttachToCreatedPages[] = "autoAttachToCreatedPages";
+static const char kOverlaySuspended[] = "overlaySuspended";
+static const char kOverlayMessage[] = "overlayMessage";
 }
 
 namespace {
@@ -374,6 +376,13 @@
 void InspectorPageAgent::Restore() {
   if (state_->booleanProperty(PageAgentState::kPageAgentEnabled, false))
     enable();
+  if (client_) {
+    String overlay_message;
+    state_->getString(PageAgentState::kOverlayMessage, &overlay_message);
+    client_->ConfigureOverlay(
+        state_->booleanProperty(PageAgentState::kOverlaySuspended, false),
+        overlay_message);
+  }
 }
 
 Response InspectorPageAgent::enable() {
@@ -394,6 +403,7 @@
       resource_content_loader_client_id_);
 
   stopScreencast();
+  configureOverlay(false, String());
 
   FinishReload();
   return Response::OK();
@@ -854,6 +864,18 @@
   return Response::OK();
 }
 
+Response InspectorPageAgent::configureOverlay(Maybe<bool> suspended,
+                                              Maybe<String> message) {
+  state_->setBoolean(PageAgentState::kOverlaySuspended,
+                     suspended.fromMaybe(false));
+  state_->setString(PageAgentState::kOverlaySuspended,
+                    message.fromMaybe(String()));
+  if (client_)
+    client_->ConfigureOverlay(suspended.fromMaybe(false),
+                              message.fromMaybe(String()));
+  return Response::OK();
+}
+
 Response InspectorPageAgent::getLayoutMetrics(
     std::unique_ptr<protocol::Page::LayoutViewport>* out_layout_viewport,
     std::unique_ptr<protocol::Page::VisualViewport>* out_visual_viewport,