Replace misc. network stub flags with more flexible ones

chromeos/dbus/dbus_thread_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 #define CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 132 matching lines @@
   virtual SessionManagerClient* GetSessionManagerClient() = 0;
   virtual ShillDeviceClient* GetShillDeviceClient() = 0;
   virtual ShillIPConfigClient* GetShillIPConfigClient() = 0;
   virtual ShillManagerClient* GetShillManagerClient() = 0;
   virtual ShillServiceClient* GetShillServiceClient() = 0;
   virtual ShillProfileClient* GetShillProfileClient() = 0;
   virtual SMSClient* GetSMSClient() = 0;
   virtual SystemClockClient* GetSystemClockClient() = 0;
   virtual UpdateEngineClient* GetUpdateEngineClient() = 0;
 
+  // These methods can be overridden by Fake or Test implementations to provide
+  // initial behavior overrides (e.g. based on command line flags).
+  virtual int GetPowerCycleDelay() const;
+  virtual int GetShillInteractiveDelay() const;

[pneubeck (no reviews), 2014/02/27 09:04:37]

not sure about GetPowerCycleDelay,
but the GetShill* should really not be part of the production code.
please move them to the FakeDBusThreadManager.

You could pass the FakeDBusThreadManager to the fake ShillClients' constructor
or alternatively pass only some configuration (which would cleanup the
dependencies).
See my later comments...

[stevenjb, 2014/02/28 02:44:06]

I'm not super thrilled about passing FakeDBusThreadManager to every ShillClient
constructor. I think I would rather just move this to the appropriate clients
instead (ShillManagerClient for Shill).
 

+  virtual std::string GetShillInitialState(const std::string& type) const;
+
   virtual ~DBusThreadManager();
 
  protected:
   DBusThreadManager();
 
  private:
   // InitializeClients is called after g_dbus_thread_manager is set.
   // NOTE: Clients that access other clients in their Init() must be
   // initialized in the correct order.
   static void InitializeClients();
 
   // Initializes |client| with the |system_bus_|.
   static void InitClient(DBusClient* client);
 
   DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_