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

Unified Diff: chromeos/network/network_connection_handler.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_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index decccfd5f35ef0aab3ac2c26a160af2523db27c4..0c829cdf4e72bbfb21c16b339bd146f97f22e7ee 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -5,12 +5,10 @@
#include "chromeos/network/network_connection_handler.h"
#include "base/bind.h"
-#include "base/command_line.h"
#include "base/json/json_reader.h"
#include "base/location.h"
#include "base/strings/string_number_conversions.h"
#include "chromeos/cert_loader.h"
-#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/dbus/shill_service_client.h"
@@ -92,11 +90,12 @@ std::string GetDefaultUserProfilePath(const NetworkState* network) {
!LoginState::Get()->IsUserAuthenticated() ||
(network && network->type() == shill::kTypeWifi &&
network->security() == shill::kSecurityNone)) {
- return NetworkProfileHandler::kSharedProfilePath;
+ return NetworkProfileHandler::GetSharedProfilePath();
}
const NetworkProfile* profile =
NetworkHandler::Get()->network_profile_handler()->GetDefaultUserProfile();
- return profile ? profile->path : NetworkProfileHandler::kSharedProfilePath;
+ return profile ? profile->path
+ : NetworkProfileHandler::GetSharedProfilePath();
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698