Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1034)

Unified Diff: chromeos/network/network_configuration_handler_unittest.cc

Issue 181413006: Replace misc. network stub flags with more flexible ones (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Elim. shill_stub_helper and move functions to clients. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d1bd4bed1f129c903331b40de0ba5ee94f4b05a7..03fabc45f278dd052aab8f9d5c625d2afaaf12f9 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc
@@ -12,8 +12,8 @@
#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"
@@ -600,7 +600,7 @@ TEST_F(NetworkConfigurationHandlerStubTest, StubCreateConfiguration) {
properties.SetStringWithoutPathExpansion(
shill::kStateProperty, shill::kStateIdle);
properties.SetStringWithoutPathExpansion(
- shill::kProfileProperty, shill_stub_helper::kSharedProfilePath);
+ shill::kProfileProperty, NetworkProfileHandler::GetSharedProfilePath());
network_configuration_handler_->CreateConfiguration(
properties,
@@ -620,7 +620,7 @@ TEST_F(NetworkConfigurationHandlerStubTest, StubCreateConfiguration) {
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

Powered by Google App Engine
This is Rietveld 408576698