Replace misc. network stub flags with more flexible ones

chromeos/network/network_device_handler_unittest.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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_shill_device_client.h"
@@ skipping 15 matching lines @@
 }  // namespace
 
 class NetworkDeviceHandlerTest : public testing::Test {
  public:
   NetworkDeviceHandlerTest() : fake_device_client_(NULL) {}
   virtual ~NetworkDeviceHandlerTest() {}
 
   virtual void SetUp() OVERRIDE {
     FakeDBusThreadManager* dbus_manager = new FakeDBusThreadManager;
     dbus_manager->SetFakeShillClients();
+    DBusThreadManager::InitializeForTesting(dbus_manager);

[pneubeck (no reviews), 2014/02/28 09:37:59]

Do you change this order just to get rid of the devices that
FakeShillManagerClient::SetupDefaultEnvironment setup up?
Please call SetupDefaultEnvironment explicitly and don't change the order here.

[stevenjb, 2014/02/28 17:43:06]

I see. This confused me, the behavior changed form how I remembered it, I
thought this was incorrect. I forgot that InitializeForTesting doesn't actually
create any fake implementations. I'll change this back.

 
+    // Set a new FakeShillDeviceClient (with no devices) after initialize
+    // dbus_manager.
     fake_device_client_ = new FakeShillDeviceClient;
     dbus_manager->SetShillDeviceClient(
         scoped_ptr<ShillDeviceClient>(fake_device_client_));
-    DBusThreadManager::InitializeForTesting(dbus_manager);
 
     success_callback_ = base::Bind(&NetworkDeviceHandlerTest::SuccessCallback,
                                    base::Unretained(this));
     properties_success_callback_ =
         base::Bind(&NetworkDeviceHandlerTest::PropertiesSuccessCallback,
                    base::Unretained(this));
     string_success_callback_ =
         base::Bind(&NetworkDeviceHandlerTest::StringSuccessCallback,
                    base::Unretained(this));
     error_callback_ = base::Bind(&NetworkDeviceHandlerTest::ErrorCallback,
@@ skipping 325 matching lines @@
   network_device_handler_->ChangePin(kUnknownCellularDevicePath,
                                      kOldPin,
                                      kNewPin,
                                      success_callback_,
                                      error_callback_);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(NetworkDeviceHandler::kErrorDeviceMissing, result_);
 }
 
 }  // namespace chromeos