[CrOS PhoneHub] Make SecureChannel's ConnectionMedium public

The ConnectionMedium enum was previously only used within the
SecureChannel implementation, since there was only a single medium
(i.e., BLE). This CL moves the enum to a public directory where it can
be used from outside the directory.

This CL is in preparation for clients being able to specify the
connection medium by passing a parameter to connection attempts
facilitated by SecureChannel.

Bug: 1106937
Change-Id: I8a8ab2d862b02ab88d3db0b8485c64d59fbf3d54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391517
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: James Vecore <vecore@google.com>
Reviewed-by: James Vecore <vecore@google.com>
Cr-Commit-Position: refs/heads/master@{#804076}

chromeos/services/secure_channel/BUILD.gn

@@ -79,8 +79,6 @@ static_library("secure_channel") {
     "connection_attempt_details.h",
     "connection_details.cc",
     "connection_details.h",
-    "connection_medium.cc",
-    "connection_medium.h",
     "connection_observer.h",
     "connection_role.cc",
     "connection_role.h",

chromeos/services/secure_channel/active_connection_manager_impl.h

@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "chromeos/services/secure_channel/active_connection_manager.h"
 #include "chromeos/services/secure_channel/connection_details.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/multiplexed_channel.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
 
 namespace chromeos {

chromeos/services/secure_channel/connection_attempt_base_unittest.cc

@@ -13,7 +13,6 @@
 #include "chromeos/services/secure_channel/ble_initiator_failure_type.h"
 #include "chromeos/services/secure_channel/connection_attempt_details.h"
 #include "chromeos/services/secure_channel/connection_details.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/connection_role.h"
 #include "chromeos/services/secure_channel/device_id_pair.h"
 #include "chromeos/services/secure_channel/fake_authenticated_channel.h"
@@ -23,6 +22,7 @@
 #include "chromeos/services/secure_channel/fake_connection_delegate.h"
 #include "chromeos/services/secure_channel/fake_pending_connection_request.h"
 #include "chromeos/services/secure_channel/pending_connection_request_delegate.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/public/cpp/shared/connection_priority.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chromeos/services/secure_channel/connection_attempt_details.h

@@ -9,9 +9,9 @@
 #include <string>
 
 #include "chromeos/services/secure_channel/connection_details.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/connection_role.h"
 #include "chromeos/services/secure_channel/device_id_pair.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 
 namespace chromeos {
 

chromeos/services/secure_channel/connection_details.h

@@ -8,7 +8,7 @@
 #include <ostream>
 #include <string>
 
-#include "chromeos/services/secure_channel/connection_medium.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 
 namespace chromeos {
 

chromeos/services/secure_channel/multiplexed_channel_impl_unittest.cc

@@ -14,12 +14,12 @@
 #include "base/stl_util.h"
 #include "base/test/task_environment.h"
 #include "chromeos/services/secure_channel/connection_details.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/fake_authenticated_channel.h"
 #include "chromeos/services/secure_channel/fake_client_connection_parameters.h"
 #include "chromeos/services/secure_channel/fake_connection_delegate.h"
 #include "chromeos/services/secure_channel/fake_multiplexed_channel.h"
 #include "chromeos/services/secure_channel/fake_single_client_message_proxy.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/single_client_message_proxy_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

chromeos/services/secure_channel/pending_connection_manager.h

@@ -12,9 +12,9 @@
 #include "chromeos/services/secure_channel/client_connection_parameters.h"
 #include "chromeos/services/secure_channel/connection_attempt_details.h"
 #include "chromeos/services/secure_channel/connection_details.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/connection_role.h"
 #include "chromeos/services/secure_channel/device_id_pair.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/public/cpp/shared/connection_priority.h"
 
 namespace chromeos {

chromeos/services/secure_channel/pending_connection_manager_impl.h

@@ -16,10 +16,10 @@
 #include "chromeos/services/secure_channel/client_connection_parameters.h"
 #include "chromeos/services/secure_channel/connection_attempt.h"
 #include "chromeos/services/secure_channel/connection_attempt_delegate.h"
-#include "chromeos/services/secure_channel/connection_medium.h"
 #include "chromeos/services/secure_channel/connection_role.h"
 #include "chromeos/services/secure_channel/device_id_pair.h"
 #include "chromeos/services/secure_channel/pending_connection_manager.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 #include "chromeos/services/secure_channel/public/cpp/shared/connection_priority.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 

chromeos/services/secure_channel/public/cpp/shared/BUILD.gn

@@ -4,6 +4,8 @@
 
 source_set("shared") {
   sources = [
+    "connection_medium.cc",
+    "connection_medium.h",
     "connection_priority.cc",
     "connection_priority.h",
   ]

chromeos/services/secure_channel/connection_medium.cc → chromeos/services/secure_channel/public/cpp/shared/connection_medium.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/services/secure_channel/connection_medium.h"
+#include "chromeos/services/secure_channel/public/cpp/shared/connection_medium.h"
 
 #include "base/check.h"
 

chromeos/services/secure_channel/connection_medium.h → chromeos/services/secure_channel/public/cpp/shared/connection_medium.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_SERVICES_SECURE_CHANNEL_CONNECTION_MEDIUM_H_
-#define CHROMEOS_SERVICES_SECURE_CHANNEL_CONNECTION_MEDIUM_H_
+#ifndef CHROMEOS_SERVICES_SECURE_CHANNEL_PUBLIC_CPP_SHARED_CONNECTION_MEDIUM_H_
+#define CHROMEOS_SERVICES_SECURE_CHANNEL_PUBLIC_CPP_SHARED_CONNECTION_MEDIUM_H_
 
 #include <ostream>
 
@@ -21,4 +21,4 @@ std::ostream& operator<<(std::ostream& stream, const ConnectionMedium& medium);
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_SERVICES_SECURE_CHANNEL_CONNECTION_MEDIUM_H_
+#endif  // CHROMEOS_SERVICES_SECURE_CHANNEL_PUBLIC_CPP_SHARED_CONNECTION_MEDIUM_H_