Migrate emulation agent to InspectorSessionState fields...

... except for the virtual time properties. I'll do these
separately so it's possible to review them.

Bug:851762

Change-Id: I49333c7e0265cfc855cdb550e6f3338f74d1ebb1
Reviewed-on: https://chromium-review.googlesource.com/1157696
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580335}

third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc

@@ -28,13 +28,6 @@ using protocol::Maybe;
 using protocol::Response;
 
 namespace EmulationAgentState {
-static const char kScriptExecutionDisabled[] = "scriptExecutionDisabled";
-static const char kScrollbarsHidden[] = "scrollbarsHidden";
-static const char kDocumentCookieDisabled[] = "documentCookieDisabled";
-static const char kTouchEventEmulationEnabled[] = "touchEventEmulationEnabled";
-static const char kMaxTouchPoints[] = "maxTouchPoints";
-static const char kEmulatedMedia[] = "emulatedMedia";
-static const char kNavigatorPlatform[] = "navigatorPlatform";
 static const char kVirtualTimeBudget[] = "virtualTimeBudget";
 static const char kVirtualTimeBudgetInitalOffset[] =
     "virtualTimeBudgetInitalOffset";
@@ -44,15 +37,24 @@ static const char kVirtualTimePolicy[] = "virtualTimePolicy";
 static const char kVirtualTimeTaskStarvationCount[] =
     "virtualTimeTaskStarvationCount";
 static const char kWaitForNavigation[] = "waitForNavigation";
-static const char kUserAgentOverride[] = "userAgentOverride";
-static const char kAcceptLanguageOverride[] = "acceptLanguage";
 }  // namespace EmulationAgentState
 
 InspectorEmulationAgent::InspectorEmulationAgent(
     WebLocalFrameImpl* web_local_frame_impl)
     : web_local_frame_(web_local_frame_impl),
-      default_background_color_override_rgba_(
-          &agent_state_, /*default_value=*/ WTF::String()) {}
+      default_background_color_override_rgba_(&agent_state_,
+                                              /*default_value=*/WTF::String()),
+      script_execution_disabled_(&agent_state_, /*default_value=*/false),
+      scrollbars_hidden_(&agent_state_, /*default_value=*/false),
+      document_cookie_disabled_(&agent_state_, /*default_value=*/false),
+      touch_event_emulation_enabled_(&agent_state_, /*default_value=*/false),
+      max_touch_points_(&agent_state_, /*default_value=*/1),
+      emulated_media_(&agent_state_, /*default_value=*/WTF::String()),
+      navigator_platform_override_(&agent_state_,
+                                   /*default_value=*/WTF::String()),
+      user_agent_override_(&agent_state_, /*default_value=*/WTF::String()),
+      accept_language_override_(&agent_state_,
+                                /*default_value=*/WTF::String()) {}
 
 InspectorEmulationAgent::~InspectorEmulationAgent() = default;
 
@@ -61,36 +63,22 @@ WebViewImpl* InspectorEmulationAgent::GetWebViewImpl() {
 }
 
 void InspectorEmulationAgent::Restore() {
-  String user_agent;
-  state_->getString(EmulationAgentState::kUserAgentOverride, &user_agent);
-  String accept_language;
-  state_->getString(EmulationAgentState::kAcceptLanguageOverride,
-                    &accept_language);
-  String navigator_platform;
-  state_->getString(EmulationAgentState::kNavigatorPlatform,
-                    &navigator_platform);
-  setUserAgentOverride(user_agent, accept_language, navigator_platform);
+  setUserAgentOverride(user_agent_override_.Get(),
+                       accept_language_override_.Get(),
+                       navigator_platform_override_.Get());
   if (!web_local_frame_)
     return;
 
   // Following code only runs for pages.
-  if (state_->booleanProperty(EmulationAgentState::kScriptExecutionDisabled,
-                              false)) {
+  if (script_execution_disabled_.Get())
     GetWebViewImpl()->GetDevToolsEmulator()->SetScriptExecutionDisabled(true);
-  }
-  if (state_->booleanProperty(EmulationAgentState::kScrollbarsHidden, false))
+  if (scrollbars_hidden_.Get())
     GetWebViewImpl()->GetDevToolsEmulator()->SetScrollbarsHidden(true);
-  if (state_->booleanProperty(EmulationAgentState::kDocumentCookieDisabled,
-                              false)) {
+  if (document_cookie_disabled_.Get())
     GetWebViewImpl()->GetDevToolsEmulator()->SetDocumentCookieDisabled(true);
-  }
-  setTouchEmulationEnabled(
-      state_->booleanProperty(EmulationAgentState::kTouchEventEmulationEnabled,
-                              false),
-      state_->integerProperty(EmulationAgentState::kMaxTouchPoints, 1));
-  String emulated_media;
-  state_->getString(EmulationAgentState::kEmulatedMedia, &emulated_media);
-  setEmulatedMedia(emulated_media);
+  setTouchEmulationEnabled(touch_event_emulation_enabled_.Get(),
+                           max_touch_points_.Get());
+  setEmulatedMedia(emulated_media_.Get());
   if (!default_background_color_override_rgba_.Get().IsNull()) {
     std::unique_ptr<protocol::Value> parsed = protocol::StringUtil::parseJSON(
         default_background_color_override_rgba_.Get());
@@ -200,11 +188,9 @@ Response InspectorEmulationAgent::setScriptExecutionDisabled(bool value) {
   Response response = AssertPage();
   if (!response.isSuccess())
     return response;
-  if (state_->booleanProperty(EmulationAgentState::kScriptExecutionDisabled,
-                              false) == value) {
+  if (script_execution_disabled_.Get() == value)
     return response;
-  }
-  state_->setBoolean(EmulationAgentState::kScriptExecutionDisabled, value);
+  script_execution_disabled_.Set(value);
   GetWebViewImpl()->GetDevToolsEmulator()->SetScriptExecutionDisabled(value);
   return response;
 }
@@ -213,11 +199,9 @@ Response InspectorEmulationAgent::setScrollbarsHidden(bool hidden) {
   Response response = AssertPage();
   if (!response.isSuccess())
     return response;
-  if (state_->booleanProperty(EmulationAgentState::kScrollbarsHidden, false) ==
-      hidden) {
+  if (scrollbars_hidden_.Get() == hidden)
     return response;
-  }
-  state_->setBoolean(EmulationAgentState::kScrollbarsHidden, hidden);
+  scrollbars_hidden_.Set(hidden);
   GetWebViewImpl()->GetDevToolsEmulator()->SetScrollbarsHidden(hidden);
   return response;
 }
@@ -226,11 +210,9 @@ Response InspectorEmulationAgent::setDocumentCookieDisabled(bool disabled) {
   Response response = AssertPage();
   if (!response.isSuccess())
     return response;
-  if (state_->booleanProperty(EmulationAgentState::kDocumentCookieDisabled,
-                              false) == disabled) {
+  if (document_cookie_disabled_.Get() == disabled)
     return response;
-  }
-  state_->setBoolean(EmulationAgentState::kDocumentCookieDisabled, disabled);
+  document_cookie_disabled_.Set(disabled);
   GetWebViewImpl()->GetDevToolsEmulator()->SetDocumentCookieDisabled(disabled);
   return response;
 }
@@ -247,8 +229,8 @@ Response InspectorEmulationAgent::setTouchEmulationEnabled(
         "Touch points must be between 1 and " +
         String::Number(WebTouchEvent::kTouchesLengthCap));
   }
-  state_->setBoolean(EmulationAgentState::kTouchEventEmulationEnabled, enabled);
-  state_->setInteger(EmulationAgentState::kMaxTouchPoints, max_points);
+  touch_event_emulation_enabled_.Set(enabled);
+  max_touch_points_.Set(max_points);
   GetWebViewImpl()->GetDevToolsEmulator()->SetTouchEventEmulationEnabled(
       enabled, max_points);
   return response;
@@ -258,7 +240,7 @@ Response InspectorEmulationAgent::setEmulatedMedia(const String& media) {
   Response response = AssertPage();
   if (!response.isSuccess())
     return response;
-  state_->setString(EmulationAgentState::kEmulatedMedia, media);
+  emulated_media_.Set(media);
   GetWebViewImpl()->GetPage()->GetSettings().SetMediaTypeOverride(media);
   return response;
 }
@@ -398,15 +380,12 @@ void InspectorEmulationAgent::WillSendRequest(
     const ResourceResponse& redirect_response,
     const FetchInitiatorInfo& initiator_info,
     Resource::Type resource_type) {
-  String accept_lang_override;
-  state_->getString(EmulationAgentState::kAcceptLanguageOverride,
-                    &accept_lang_override);
-  if (!accept_lang_override.IsEmpty() &&
+  if (!accept_language_override_.Get().IsEmpty() &&
       request.HttpHeaderField("Accept-Language").IsEmpty()) {
     request.SetHTTPHeaderField(
         "Accept-Language",
-        AtomicString(
-            NetworkUtils::GenerateAcceptLanguageHeader(accept_lang_override)));
+        AtomicString(NetworkUtils::GenerateAcceptLanguageHeader(
+            accept_language_override_.Get())));
   }
 }
 
@@ -415,7 +394,7 @@ Response InspectorEmulationAgent::setNavigatorOverrides(
   Response response = AssertPage();
   if (!response.isSuccess())
     return response;
-  state_->setString(EmulationAgentState::kNavigatorPlatform, platform);
+  navigator_platform_override_.Set(platform);
   GetWebViewImpl()->GetPage()->GetSettings().SetNavigatorPlatformOverride(
       platform);
   return response;
@@ -499,32 +478,24 @@ Response InspectorEmulationAgent::setUserAgentOverride(
     protocol::Maybe<String> platform) {
   if (!user_agent.IsEmpty() || accept_language.isJust() || platform.isJust())
     InnerEnable();
-  state_->setString(EmulationAgentState::kUserAgentOverride, user_agent);
-  state_->setString(EmulationAgentState::kAcceptLanguageOverride,
-                    accept_language.fromMaybe(String()));
-  state_->setString(EmulationAgentState::kNavigatorPlatform,
-                    platform.fromMaybe(String()));
+  user_agent_override_.Set(user_agent);
+  accept_language_override_.Set(accept_language.fromMaybe(String()));
+  navigator_platform_override_.Set(platform.fromMaybe(String()));
   if (web_local_frame_) {
     GetWebViewImpl()->GetPage()->GetSettings().SetNavigatorPlatformOverride(
-        platform.fromMaybe(String()));
+        navigator_platform_override_.Get());
   }
   return Response::OK();
 }
 
 void InspectorEmulationAgent::ApplyAcceptLanguageOverride(String* accept_lang) {
-  String accept_lang_override;
-  state_->getString(EmulationAgentState::kAcceptLanguageOverride,
-                    &accept_lang_override);
-  if (!accept_lang_override.IsEmpty())
-    *accept_lang = accept_lang_override;
+  if (!accept_language_override_.Get().IsEmpty())
+    *accept_lang = accept_language_override_.Get();
 }
 
 void InspectorEmulationAgent::ApplyUserAgentOverride(String* user_agent) {
-  String user_agent_override;
-  state_->getString(EmulationAgentState::kUserAgentOverride,
-                    &user_agent_override);
-  if (!user_agent_override.IsEmpty())
-    *user_agent = user_agent_override;
+  if (!user_agent_override_.Get().IsEmpty())
+    *user_agent = user_agent_override_.Get();
 }
 
 void InspectorEmulationAgent::InnerEnable() {

third_party/blink/renderer/core/inspector/inspector_emulation_agent.h

@@ -123,6 +123,15 @@ class CORE_EXPORT InspectorEmulationAgent final
   bool enabled_ = false;
 
   InspectorAgentState::String default_background_color_override_rgba_;
+  InspectorAgentState::Boolean script_execution_disabled_;
+  InspectorAgentState::Boolean scrollbars_hidden_;
+  InspectorAgentState::Boolean document_cookie_disabled_;
+  InspectorAgentState::Boolean touch_event_emulation_enabled_;
+  InspectorAgentState::Integer max_touch_points_;
+  InspectorAgentState::String emulated_media_;
+  InspectorAgentState::String navigator_platform_override_;
+  InspectorAgentState::String user_agent_override_;
+  InspectorAgentState::String accept_language_override_;
   DISALLOW_COPY_AND_ASSIGN(InspectorEmulationAgent);
 };