Fix reconnect in case of empty global network policy.

chromeos/dbus/fake_shill_service_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_service_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 382 matching lines @@
   properties->SetWithoutPathExpansion(
       shill::kStateProperty,
       new base::StringValue(state));
   properties->SetWithoutPathExpansion(
       shill::kVisibleProperty,
       new base::FundamentalValue(visible));
   if (type == shill::kTypeWifi) {
     properties->SetWithoutPathExpansion(
         shill::kSecurityProperty,
         new base::StringValue(shill::kSecurityNone));
+    properties->SetWithoutPathExpansion(
+        shill::kModeProperty,
+        new base::StringValue(shill::kModeManaged));
   }
   return properties;
 }
 
 void FakeShillServiceClient::RemoveService(const std::string& service_path) {
   stub_services_.RemoveWithoutPathExpansion(service_path, NULL);
   connect_behavior_.erase(service_path);
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       RemoveManagerService(service_path);
 }
@@ skipping 21 matching lines @@
     new_properties.SetWithoutPathExpansion(shill::kProviderProperty, provider);
     changed_property = shill::kProviderProperty;
   } else {
     new_properties.SetWithoutPathExpansion(property, value.DeepCopy());
     changed_property = property;
   }
 
   dict->MergeDictionary(&new_properties);
 
   // Add or update the profile entry.
+  ShillProfileClient::TestInterface* profile_test =
+      DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface();
   if (property == shill::kProfileProperty) {
     std::string profile_path;
     if (value.GetAsString(&profile_path)) {
-      DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface()->
-          AddService(profile_path, service_path);
+      if (!profile_path.empty())
+        profile_test->AddService(profile_path, service_path);

[stevenjb, 2014/10/20 16:15:35]

If profile_path is set to empty, should we remove the service?

[pneubeck (no reviews), 2014/10/20 16:21:24]

Not sure. Removing the profile path could also mean that the network is still
visible but in the 'ephemeral' profile.

     } else {
       LOG(ERROR) << "Profile value is not a String!";
     }
   } else {
     std::string profile_path;
     if (dict->GetStringWithoutPathExpansion(
             shill::kProfileProperty, &profile_path) && !profile_path.empty()) {
-      DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface()->
-          UpdateService(profile_path, service_path);
+      profile_test->UpdateService(profile_path, service_path);
     }
   }
 
   // Notify the Manager if the state changed (affects DefaultService).
   if (property == shill::kStateProperty) {
     std::string state;
     value.GetAsString(&state);
     DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
         ServiceStateChanged(service_path, state);
   }
@@ skipping 160 matching lines @@
   } else {
     // Set Online.
     VLOG(1) << "Setting state to Online " << service_path;
     SetServiceProperty(service_path,
                        shill::kStateProperty,
                        base::StringValue(shill::kStateOnline));
   }
 }
 
 }  // namespace chromeos