[CrOS Cellular] Remove parameter from StartActivation() call.

An earlier design planned to pass a "cellular network GUID" parameter to
StartActivation(), but this is no longer the case, since activation
should be allowed even if the device has no SIM card (and thus, no
cellular network).

This CL removes the parameter; a follow-up CL adds the implementation
for this function.

Bug: 961084
Change-Id: Ie3026c2b8400f79bd317becb0fc71c5bf740bbf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629124
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664147}

chromeos/services/cellular_setup/cellular_setup_impl.cc

@@ -37,7 +37,6 @@ CellularSetupImpl::CellularSetupImpl() = default;
 CellularSetupImpl::~CellularSetupImpl() = default;
 
 void CellularSetupImpl::StartActivation(
-    const std::string& cellular_network_guid,
     mojom::ActivationDelegatePtr delegate,
     StartActivationCallback callback) {
   // TODO(khorimoto): Actually return a CarrierPortalObserver instead of

chromeos/services/cellular_setup/cellular_setup_impl.h

@@ -29,8 +29,7 @@ class CellularSetupImpl : public CellularSetupBase {
   CellularSetupImpl();
 
   // mojom::CellularSetup:
-  void StartActivation(const std::string& cellular_network_guid,
-                       mojom::ActivationDelegatePtr delegate,
+  void StartActivation(mojom::ActivationDelegatePtr delegate,
                        StartActivationCallback callback) override;
 
   DISALLOW_COPY_AND_ASSIGN(CellularSetupImpl);

chromeos/services/cellular_setup/cellular_setup_service_unittest.cc

@@ -29,7 +29,6 @@ namespace {
 using CarrierPortalHandlerPair =
     std::pair<mojom::CarrierPortalHandlerPtr, FakeCarrierPortalHandler*>;
 
-const char kTestCellularNetworkGuid[] = "testCellularNetworkGuid";
 const char kTestPaymentUrl[] = "testPaymentUrl";
 const char kTestPaymentPostData[] = "testPaymentPostData";
 const char kTestCarrier[] = "testCarrier";
@@ -86,7 +85,6 @@ class CellularSetupServiceTest : public testing::Test {
   // Calls StartActivation() and returns the fake CarrierPortalHandler and its
   // associated InterfacePtr.
   CarrierPortalHandlerPair CallStartActivation(
-      const std::string& cellular_network_guid,
       FakeActivationDelegate* fake_activation_delegate) {
     std::vector<std::unique_ptr<FakeCellularSetup::StartActivationInvocation>>&
         start_activation_invocations =
@@ -96,15 +94,13 @@ class CellularSetupServiceTest : public testing::Test {
 
     // Make StartActivation() call and propagate it to the service.
     cellular_setup_ptr_->StartActivation(
-        cellular_network_guid, fake_activation_delegate->GenerateInterfacePtr(),
+        fake_activation_delegate->GenerateInterfacePtr(),
         base::BindOnce(&CellularSetupServiceTest::OnStartActivationResult,
                        base::Unretained(this), run_loop.QuitClosure()));
     cellular_setup_ptr_.FlushForTesting();
 
     // Verify that the call was made successfully.
     EXPECT_EQ(num_args_before_call + 1u, start_activation_invocations.size());
-    EXPECT_EQ(cellular_network_guid,
-              start_activation_invocations.back()->cellular_network_guid());
 
     // Execute the callback and retrieve the returned CarrierPortalHandler.
     FakeCarrierPortalHandler* fake_carrier_portal_observer =
@@ -215,8 +211,8 @@ class CellularSetupServiceTest : public testing::Test {
 TEST_F(CellularSetupServiceTest, StartActivation_Success) {
   auto fake_activation_delegate = std::make_unique<FakeActivationDelegate>();
 
-  CarrierPortalHandlerPair pair = CallStartActivation(
-      kTestCellularNetworkGuid, fake_activation_delegate.get());
+  CarrierPortalHandlerPair pair =
+      CallStartActivation(fake_activation_delegate.get());
   NotifyLastDelegateThatActivationStarted(fake_activation_delegate.get());
 
   SendCarrierPortalStatusUpdate(
@@ -232,8 +228,8 @@ TEST_F(CellularSetupServiceTest, StartActivation_Success) {
 TEST_F(CellularSetupServiceTest, StartActivation_PortalFailsToLoad) {
   auto fake_activation_delegate = std::make_unique<FakeActivationDelegate>();
 
-  CarrierPortalHandlerPair pair = CallStartActivation(
-      kTestCellularNetworkGuid, fake_activation_delegate.get());
+  CarrierPortalHandlerPair pair =
+      CallStartActivation(fake_activation_delegate.get());
   NotifyLastDelegateThatActivationStarted(fake_activation_delegate.get());
 
   SendCarrierPortalStatusUpdate(mojom::CarrierPortalStatus::kPortalFailedToLoad,
@@ -247,8 +243,8 @@ TEST_F(CellularSetupServiceTest, StartActivation_PortalFailsToLoad) {
 TEST_F(CellularSetupServiceTest, StartActivation_ErrorDuringPayment) {
   auto fake_activation_delegate = std::make_unique<FakeActivationDelegate>();
 
-  CarrierPortalHandlerPair pair = CallStartActivation(
-      kTestCellularNetworkGuid, fake_activation_delegate.get());
+  CarrierPortalHandlerPair pair =
+      CallStartActivation(fake_activation_delegate.get());
   NotifyLastDelegateThatActivationStarted(fake_activation_delegate.get());
 
   SendCarrierPortalStatusUpdate(

chromeos/services/cellular_setup/public/cpp/fake_cellular_setup.cc

@@ -13,11 +13,9 @@ namespace chromeos {
 namespace cellular_setup {
 
 FakeCellularSetup::StartActivationInvocation::StartActivationInvocation(
-    const std::string& cellular_network_guid,
     mojom::ActivationDelegatePtr activation_delegate,
     StartActivationCallback callback)
-    : cellular_network_guid_(cellular_network_guid),
-      activation_delegate_(std::move(activation_delegate)),
+    : activation_delegate_(std::move(activation_delegate)),
       callback_(std::move(callback)) {}
 
 FakeCellularSetup::StartActivationInvocation::~StartActivationInvocation() =
@@ -40,7 +38,6 @@ FakeCellularSetup::FakeCellularSetup() = default;
 FakeCellularSetup::~FakeCellularSetup() = default;
 
 void FakeCellularSetup::StartActivation(
-    const std::string& cellular_network_guid,
     mojom::ActivationDelegatePtr activation_delegate,
     StartActivationCallback callback) {
   DCHECK(activation_delegate);
@@ -48,8 +45,7 @@ void FakeCellularSetup::StartActivation(
 
   start_activation_invocations_.emplace_back(
       std::make_unique<StartActivationInvocation>(
-          cellular_network_guid, std::move(activation_delegate),
-          std::move(callback)));
+          std::move(activation_delegate), std::move(callback)));
 }
 
 }  // namespace cellular_setup

chromeos/services/cellular_setup/public/cpp/fake_cellular_setup.h

@@ -23,15 +23,10 @@ class FakeCellularSetup : public CellularSetupBase {
  public:
   class StartActivationInvocation {
    public:
-    StartActivationInvocation(const std::string& cellular_network_guid,
-                              mojom::ActivationDelegatePtr activation_delegate,
+    StartActivationInvocation(mojom::ActivationDelegatePtr activation_delegate,
                               StartActivationCallback callback);
     ~StartActivationInvocation();
 
-    const std::string& cellular_network_guid() const {
-      return cellular_network_guid_;
-    }
-
     mojom::ActivationDelegatePtr& activation_delegate() {
       return activation_delegate_;
     }
@@ -42,7 +37,6 @@ class FakeCellularSetup : public CellularSetupBase {
     FakeCarrierPortalHandler* ExecuteCallback();
 
    private:
-    std::string cellular_network_guid_;
     mojom::ActivationDelegatePtr activation_delegate_;
     StartActivationCallback callback_;
 
@@ -62,8 +56,7 @@ class FakeCellularSetup : public CellularSetupBase {
 
  private:
   // mojom::CellularSetup:
-  void StartActivation(const std::string& cellular_network_guid,
-                       mojom::ActivationDelegatePtr activation_delegate,
+  void StartActivation(mojom::ActivationDelegatePtr activation_delegate,
                        StartActivationCallback callback) override;
 
   std::vector<std::unique_ptr<StartActivationInvocation>>

chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom

@@ -80,12 +80,8 @@ interface ActivationDelegate {
 
 // Interface used to set up a cellular connection.
 interface CellularSetup {
-  // Entrypoint to the activation flow. |cellular_network_guid| corresponds to
-  // the GUID associated with the cellular network, obtained via
-  // chromeos::NetworkState::guid(). |delegate|'s OnActivationFinished()
-  // function is guaranteed to be called. If |delegate| becomes disconnected
+  // Entrypoint to the activation flow. If |delegate| becomes disconnected
   // during the activation process, activation is cancelled.
-  StartActivation(
-      string cellular_network_guid,
-      ActivationDelegate delegate) => (CarrierPortalHandler observer);
+  StartActivation(ActivationDelegate delegate)
+      => (CarrierPortalHandler observer);
 };