Replace misc. network stub flags with more flexible ones

chromeos/network/network_configuration_handler_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #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_stub_helper.h"
 #include "chromeos/network/network_configuration_handler.h"
+#include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "chromeos/network/shill_property_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ skipping 566 matching lines @@
   const std::string service_path("test_wifi");
   base::DictionaryValue properties;
   shill_property_util::SetSSID(service_path, &properties);
   properties.SetStringWithoutPathExpansion(shill::kNameProperty, service_path);
   properties.SetStringWithoutPathExpansion(shill::kGuidProperty, service_path);
   properties.SetStringWithoutPathExpansion(
       shill::kTypeProperty, shill::kTypeWifi);
   properties.SetStringWithoutPathExpansion(
       shill::kStateProperty, shill::kStateIdle);
   properties.SetStringWithoutPathExpansion(
-      shill::kProfileProperty, shill_stub_helper::kSharedProfilePath);
+      shill::kProfileProperty, NetworkProfileHandler::GetSharedProfilePath());
 
   network_configuration_handler_->CreateConfiguration(
       properties,
       base::Bind(
           &NetworkConfigurationHandlerStubTest::CreateConfigurationCallback,
           base::Unretained(this)),
       base::Bind(&ErrorCallback, false, service_path));
   message_loop_.RunUntilIdle();
 
   EXPECT_FALSE(create_service_path_.empty());
 
   std::string guid;
   EXPECT_TRUE(GetServiceStringProperty(
       create_service_path_, shill::kGuidProperty, &guid));
   EXPECT_EQ(service_path, guid);
 
   std::string actual_profile;
   EXPECT_TRUE(GetServiceStringProperty(
       create_service_path_, shill::kProfileProperty, &actual_profile));
-  EXPECT_EQ(shill_stub_helper::kSharedProfilePath, actual_profile);
+  EXPECT_EQ(NetworkProfileHandler::GetSharedProfilePath(), actual_profile);
 }
 
 }  // namespace chromeos