Added stub portalled wifi network.

chromeos/dbus/shill_service_client_stub.cc

 // Copyright (c) 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/shill_service_client_stub.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 23 matching lines @@
 
 void PassStubServiceProperties(
     const ShillServiceClient::DictionaryValueCallback& callback,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue* properties) {
   callback.Run(call_status, *properties);
 }
 
 }  // namespace
 
+const char ShillServiceClientStub::kStubPortalledWifiPath[] = "portalled_wifi";
+const char ShillServiceClientStub::kStubPortalledWifiName[] = "Portalled Wifi";

[oshima, 2013/08/06 21:00:02]

If you follow my suggestion, you can put them in anonyous namespace.

[ygorshenin1, 2013/08/07 09:00:30]

Done.

+
 ShillServiceClientStub::ShillServiceClientStub() : weak_ptr_factory_(this) {
   SetDefaultProperties();
 }
 
 ShillServiceClientStub::~ShillServiceClientStub() {
   STLDeleteContainerPairSecondPointers(
       observer_list_.begin(), observer_list_.end());
 }
 
 // ShillServiceClient overrides.
@@ skipping 121 matching lines @@
   base::StringValue associating_value(flimflam::kStateAssociation);
   SetServiceProperty(service_path.value(),
                      flimflam::kStateProperty,
                      associating_value);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kEnableStubInteractive)) {
     const int kConnectDelaySeconds = 5;
     delay = base::TimeDelta::FromSeconds(kConnectDelaySeconds);
   }
   // Set Online after a delay
-  base::StringValue online_value(flimflam::kStateOnline);
+  std::string state = flimflam::kStateOnline;
+  if (service_path.value() == kStubPortalledWifiPath)
+    state = flimflam::kStatePortal;

[oshima, 2013/08/06 21:00:02]

base::StringValue oneline_value(
   service_path.value() == kStubPortalledWifiPath ?
   flimflam::kStatePortal : flimflam::kStateOneline);

[ygorshenin1, 2013/08/07 09:00:30]

Done.

   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ShillServiceClientStub::SetProperty,
                  weak_ptr_factory_.GetWeakPtr(),
                  service_path,
                  flimflam::kStateProperty,
-                 online_value,
+                 base::StringValue(state),
                  base::Bind(&base::DoNothing),
                  error_callback),
       delay);
   callback.Run();
 }
 
 void ShillServiceClientStub::Disconnect(const dbus::ObjectPath& service_path,
                                         const base::Closure& callback,
                                         const ErrorCallback& error_callback) {
   base::Value* service;
@@ skipping 83 matching lines @@
 }
 
 // ShillServiceClient::TestInterface overrides.
 
 void ShillServiceClientStub::AddService(const std::string& service_path,
                                         const std::string& name,
                                         const std::string& type,
                                         const std::string& state,
                                         bool add_to_visible_list,
                                         bool add_to_watch_list) {
-  AddServiceWithIPConfig(service_path, name, type, state, "",
+  std::string nstate = state;
+  if (CommandLine::ForCurrentProcess()->
+      HasSwitch(chromeos::switches::kDefaultStubNetworkStateIdle)) {
+    nstate = flimflam::kStateIdle;
+  }
+  AddServiceWithIPConfig(service_path, name, type, nstate, "",
                          add_to_visible_list, add_to_watch_list);
 }
 
 void ShillServiceClientStub::AddServiceWithIPConfig(
     const std::string& service_path,
     const std::string& name,
     const std::string& type,
     const std::string& state,
     const std::string& ipconfig_path,
     bool add_to_visible_list,
@@ skipping 99 matching lines @@
              flimflam::kStateIdle,
              add_to_visible, add_to_watchlist);
   SetServiceProperty("wifi2",
                      flimflam::kSecurityProperty,
                      base::StringValue(flimflam::kSecurityPsk));
   base::FundamentalValue strength_value(80);
   SetServiceProperty("wifi2",
                      flimflam::kSignalStrengthProperty,
                      strength_value);
 
+  if (CommandLine::ForCurrentProcess()->
+      HasSwitch(chromeos::switches::kEnableStubPortalledWifi)) {
+    AddService(kStubPortalledWifiPath, kStubPortalledWifiName,
+               flimflam::kTypeWifi,
+               flimflam::kStatePortal,
+               add_to_visible, add_to_watchlist);
+    SetServiceProperty(kStubPortalledWifiPath,
+                       flimflam::kSecurityProperty,
+                       base::StringValue(flimflam::kSecurityNone));
+  }
+
   // Wimax
 
   AddService("wimax1", "wimax1",
              flimflam::kTypeWimax,
              flimflam::kStateIdle,
              add_to_visible, add_to_watchlist);
   SetServiceProperty("wimax1",
                      flimflam::kConnectableProperty,
                      base::FundamentalValue(true));
 
@@ skipping 78 matching lines @@
   std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
       observer_list_.find(device_path);
   if (iter != observer_list_.end())
     return *(iter->second);
   PropertyObserverList* observer_list = new PropertyObserverList();
   observer_list_[device_path] = observer_list;
   return *observer_list;
 }
 
 }  // namespace chromeos