Add WiMAX to ONC validation list

chromeos/dbus/fake_shill_manager_client.cc

 // Copyright 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 "chromeos/dbus/fake_shill_manager_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 708 matching lines @@
                                    base::Bind(&UpdatePortaledWifiState,
                                               "portaled_wifi"));
       services->SetServiceProperty(kPortaledWifiPath,
                                    shill::kConnectableProperty,
                                    base::FundamentalValue(true));
       profiles->AddService(shared_profile, kPortaledWifiPath);
     }
   }
 
   // Wimax
+  const std::string kWimaxPath = "/service/wimax1";
   state = GetInitialStateForType(shill::kTypeWimax, &enabled);
   if (state != kTechnologyUnavailable) {
     AddTechnology(shill::kTypeWimax, enabled);
     devices->AddDevice(
         "/device/wimax1", shill::kTypeWimax, "stub_wimax_device1");
 
-    services->AddService("/service/wimax1",
-                         "wimax1_guid",
-                         "wimax1" /* name */,
-                         shill::kTypeWimax,
-                         state,
-                         add_to_visible);
-    services->SetServiceProperty("/service/wimax1",
-                                 shill::kConnectableProperty,
+    services->AddService(kWimaxPath, "wimax1_guid", "wimax1" /* name */,
+                         shill::kTypeWimax, state, add_to_visible);
+    services->SetServiceProperty(kWimaxPath, shill::kConnectableProperty,
                                  base::FundamentalValue(true));
     base::FundamentalValue strength_value(80);
-    services->SetServiceProperty(
-        "/service/wimax1", shill::kSignalStrengthProperty, strength_value);
+    services->SetServiceProperty(kWimaxPath, shill::kSignalStrengthProperty,
+                                 strength_value);
     base::StringValue identity_value("test.identity");
-    services->SetServiceProperty(
-        "/service/wimax1", shill::kEapIdentityProperty, identity_value);
+    services->SetServiceProperty(kWimaxPath, shill::kEapIdentityProperty,
+                                 identity_value);
+    profiles->AddService(shared_profile, kWimaxPath);

[pneubeck (no reviews), 2015/02/25 08:47:19]

probably not an expected combination: wimax+eap+sharedprofile

[stevenjb, 2015/02/25 18:19:49]

Removed the EAP property which isn't really set up correctly anyway.

   }
 
   // Cellular
   state = GetInitialStateForType(shill::kTypeCellular, &enabled);
   if (state != kTechnologyUnavailable) {
     bool activated = false;
     if (state == kNetworkActivated) {
       activated = true;
       state = shill::kStateIdle;
     }
@@ skipping 369 matching lines @@
   *enabled = true;
   if ((state == shill::kStatePortal && type != shill::kTypeWifi) ||
       (state == kNetworkActivated && type != shill::kTypeCellular)) {
     LOG(WARNING) << "Invalid state: " << state << " for " << type;
     return shill::kStateIdle;
   }
   return state;
 }
 
 }  // namespace chromeos