Refactor the setup of Shill*Stubs' default environment.

chromeos/network/network_configuration_handler_unittest.cc

Index: chromeos/network/network_configuration_handler_unittest.cc
diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc
index 2057beeee1ff3e52ac44451e246ae46cd314fe7e..b8b019c80b50b3de6782b052d24b887cb4d4790d 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -12,7 +12,7 @@
 #include "chromeos/dbus/mock_shill_manager_client.h"
 #include "chromeos/dbus/mock_shill_profile_client.h"
 #include "chromeos/dbus/mock_shill_service_client.h"
-#include "chromeos/dbus/shill_profile_client_stub.h"
+#include "chromeos/dbus/shill_stub_helper.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
@@ -592,7 +592,7 @@ TEST_F(NetworkConfigurationHandlerStubTest, StubCreateConfiguration) {
   properties.SetStringWithoutPathExpansion(
       flimflam::kStateProperty, flimflam::kStateIdle);
   properties.SetStringWithoutPathExpansion(
-      flimflam::kProfileProperty, ShillProfileClientStub::kSharedProfilePath);
+      flimflam::kProfileProperty, shill_stub_helper::kSharedProfilePath);
 
   network_configuration_handler_->CreateConfiguration(
       properties,
@@ -612,7 +612,7 @@ TEST_F(NetworkConfigurationHandlerStubTest, StubCreateConfiguration) {
 
   EXPECT_TRUE(GetServiceStringProperty(
       create_service_path_, flimflam::kProfileProperty, &actual_profile));
-  EXPECT_EQ(ShillProfileClientStub::kSharedProfilePath, actual_profile);
+  EXPECT_EQ(shill_stub_helper::kSharedProfilePath, actual_profile);
 }
 
 }  // namespace chromeos