Introduce content::PageState

content/renderer/context_menu_params_builder.cc

 // Copyright (c) 2013 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 "content/renderer/context_menu_params_builder.h"
 
 #include "base/logging.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/public/common/context_menu_params.h"
+#include "content/public/renderer/history_item_serialization.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
-#include "webkit/glue/glue_serialize.h"
 
 namespace content {
 
 // static
 ContextMenuParams ContextMenuParamsBuilder::Build(
     const WebKit::WebContextMenuData& data) {
   ContextMenuParams params;
   params.media_type = data.mediaType;
   params.x = data.mousePosition.x;
   params.y = data.mousePosition.y;
@@ skipping 19 matching lines @@
   params.frame_charset = data.frameEncoding.utf8();
   params.referrer_policy = data.referrerPolicy;
 
   for (size_t i = 0; i < data.dictionarySuggestions.size(); ++i)
     params.dictionary_suggestions.push_back(data.dictionarySuggestions[i]);
 
   params.custom_context.is_pepper_menu = false;
   for (size_t i = 0; i < data.customItems.size(); ++i)
     params.custom_items.push_back(WebMenuItem(data.customItems[i]));
 
-  if (!data.frameHistoryItem.isNull()) {
-    params.frame_content_state =
-        webkit_glue::HistoryItemToString(data.frameHistoryItem);
-  }
+  if (!data.frameHistoryItem.isNull())
+    params.frame_page_state = HistoryItemToPageState(data.frameHistoryItem);
 
   if (!params.link_url.is_empty()) {
     WebKit::WebNode selectedNode = data.node;
 
     // If there are other embedded tags (like <a ..>Some <b>text</b></a>)
     // we need to extract the parent <a/> node.
     while (!selectedNode.isLink() && !selectedNode.parentNode().isNull()) {
       selectedNode = selectedNode.parentNode();
     }
 
@@ skipping 13 matching lines @@
                             &params.security_info.cert_id,
                             &params.security_info.cert_status,
                             &params.security_info.security_bits,
                             &params.security_info.connection_status);
   }
 
   return params;
 }
 
 }  // namespace content