[Presentation API] Remove references to presentation sessions.

content/common/presentation/presentation_struct_traits.h

Index: content/common/presentation/presentation_struct_traits.h
diff --git a/content/common/presentation/presentation_struct_traits.h b/content/common/presentation/presentation_struct_traits.h
index 7fa9c8046be002c480a2c97bce084202ab745beb..81c1f6ca7833b7d988eafc64f24d40915f2b3f75 100644
--- a/content/common/presentation/presentation_struct_traits.h
+++ b/content/common/presentation/presentation_struct_traits.h
@@ -12,7 +12,7 @@
 #include "base/optional.h"
 #include "base/strings/string_util.h"
 #include "content/public/common/presentation_connection_message.h"
-#include "content/public/common/presentation_session.h"
+#include "content/public/common/presentation_info.h"
 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "url/mojo/url.mojom.h"
 
@@ -26,8 +26,9 @@ struct EnumTraits<blink::mojom::PresentationErrorType,
     switch (input) {
       case content::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS:
         return blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS;
-      case content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED:
-        return blink::mojom::PresentationErrorType::SESSION_REQUEST_CANCELLED;
+      case content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED:
+        return blink::mojom::PresentationErrorType::
+            PRESENTATION_REQUEST_CANCELLED;
       case content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND:
         return blink::mojom::PresentationErrorType::NO_PRESENTATION_FOUND;
       case content::PRESENTATION_ERROR_PREVIOUS_START_IN_PROGRESS:
@@ -46,8 +47,8 @@ struct EnumTraits<blink::mojom::PresentationErrorType,
       case blink::mojom::PresentationErrorType::NO_AVAILABLE_SCREENS:
         *output = content::PRESENTATION_ERROR_NO_AVAILABLE_SCREENS;
         return true;
-      case blink::mojom::PresentationErrorType::SESSION_REQUEST_CANCELLED:
-        *output = content::PRESENTATION_ERROR_SESSION_REQUEST_CANCELLED;
+      case blink::mojom::PresentationErrorType::PRESENTATION_REQUEST_CANCELLED:
+        *output = content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED;
         return true;
       case blink::mojom::PresentationErrorType::NO_PRESENTATION_FOUND:
         *output = content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND;
@@ -141,19 +142,19 @@ struct EnumTraits<blink::mojom::PresentationConnectionCloseReason,
 };
 
 template <>
-struct StructTraits<blink::mojom::PresentationSessionInfoDataView,
-                    content::PresentationSessionInfo> {
-  static const GURL& url(const content::PresentationSessionInfo& session_info) {
-    return session_info.presentation_url;
+struct StructTraits<blink::mojom::PresentationInfoDataView,
+                    content::PresentationInfo> {
+  static const GURL& url(const content::PresentationInfo& presentation_info) {
+    return presentation_info.presentation_url;
   }
 
   static const std::string& id(
-      const content::PresentationSessionInfo& session_info) {
-    return session_info.presentation_id;
+      const content::PresentationInfo& presentation_info) {
+    return presentation_info.presentation_id;
   }
 
-  static bool Read(blink::mojom::PresentationSessionInfoDataView data,
-                   content::PresentationSessionInfo* out);
+  static bool Read(blink::mojom::PresentationInfoDataView data,
+                   content::PresentationInfo* out);
 };
 
 template <>