[Presentation API] Remove references to presentation sessions.

content/common/presentation/presentation_struct_traits.h

 // Copyright 2017 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.
 
 #ifndef CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_
 #define CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #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"
 
 namespace mojo {
 
 template <>
 struct EnumTraits<blink::mojom::PresentationErrorType,
                   content::PresentationErrorType> {
   static blink::mojom::PresentationErrorType ToMojom(
       content::PresentationErrorType input) {
     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:
         return blink::mojom::PresentationErrorType::PREVIOUS_START_IN_PROGRESS;
       case content::PRESENTATION_ERROR_UNKNOWN:
         return blink::mojom::PresentationErrorType::UNKNOWN;
     }
     NOTREACHED() << "Unknown content::PresentationErrorType "
                  << static_cast<int>(input);
     return blink::mojom::PresentationErrorType::UNKNOWN;
   }
 
   static bool FromMojom(blink::mojom::PresentationErrorType input,
                         content::PresentationErrorType* output) {
     switch (input) {
       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;
         return true;
       case blink::mojom::PresentationErrorType::PREVIOUS_START_IN_PROGRESS:
         *output = content::PRESENTATION_ERROR_PREVIOUS_START_IN_PROGRESS;
         return true;
       case blink::mojom::PresentationErrorType::UNKNOWN:
         *output = content::PRESENTATION_ERROR_UNKNOWN;
         return true;
@@ skipping 73 matching lines @@
         return true;
       case blink::mojom::PresentationConnectionCloseReason::WENT_AWAY:
         *output = content::PRESENTATION_CONNECTION_CLOSE_REASON_WENT_AWAY;
         return true;
     }
     return false;
   }
 };
 
 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 <>
 struct StructTraits<blink::mojom::PresentationErrorDataView,
                     content::PresentationError> {
   static content::PresentationErrorType error_type(
       const content::PresentationError& error) {
     return error.error_type;
   }
 
@@ skipping 28 matching lines @@
     return message.data.value();
   }
 
   static bool Read(blink::mojom::PresentationConnectionMessageDataView data,
                    content::PresentationConnectionMessage* out);
 };
 
 }  // namespace mojo
 
 #endif  // CONTENT_COMMON_PRESENTATION_PRESENTATION_STRUCT_TRAITS_H_