diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 22:05:06 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 22:05:06 +0000 |
| commit | be3a3d3d8a676dc94239522600a38149c6f820f5 (patch) | |
| tree | e106070abc4454ebd03c46ee282bcfb13e78449b /chromeos | |
| parent | 8eb3fbd2ec37456d5347dac4a010fb4703d560d4 (diff) | |
| download | chromium_src-be3a3d3d8a676dc94239522600a38149c6f820f5.zip chromium_src-be3a3d3d8a676dc94239522600a38149c6f820f5.tar.gz chromium_src-be3a3d3d8a676dc94239522600a38149c6f820f5.tar.bz2 | |
Remove GetEAPForEthernet error messages from tests.
This removes error messages like
network_state_handler.cc:404 GetEAPForEthernet: Unknown device eth1 of connected ethernet service
when running browser tests.
BUG=NONE
Review URL: https://codereview.chromium.org/27328002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/dbus/shill_stub_helper.cc | 8 | ||||
| -rw-r--r-- | chromeos/network/network_state_handler.cc | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chromeos/dbus/shill_stub_helper.cc b/chromeos/dbus/shill_stub_helper.cc index 141470a..68dfa68 100644 --- a/chromeos/dbus/shill_stub_helper.cc +++ b/chromeos/dbus/shill_stub_helper.cc @@ -20,6 +20,7 @@ namespace shill_stub_helper { namespace { +const char kDevicePathEthernet[] = "/device/eth1"; const char kDevicePathWifi[] = "/device/wifi1"; const char kDevicePathCellular[] = "/device/cellular1"; const char kDevicePathWimax[] = "/device/wimax1"; @@ -71,17 +72,16 @@ void SetupDefaultEnvironment() { profiles->AddProfile(kSharedProfilePath, std::string()); - // Add a wifi device. + devices->AddDevice( + kDevicePathEthernet, shill::kTypeEthernet, "stub_eth_device1"); devices->AddDevice(kDevicePathWifi, shill::kTypeWifi, "stub_wifi_device1"); - // Add a cellular device. Used in SMS stub. devices->AddDevice( kDevicePathCellular, shill::kTypeCellular, "stub_cellular_device1"); devices->SetDeviceProperty(kDevicePathCellular, shill::kCarrierProperty, base::StringValue(shill::kCarrierSprint)); - // Add a wimax device. devices->AddDevice(kDevicePathWimax, shill::kTypeWimax, "stub_wimax_device1"); const bool add_to_visible = true; @@ -197,6 +197,8 @@ void SetupDefaultEnvironment() { } std::string DevicePathForType(const std::string& type) { + if (type == shill::kTypeEthernet) + return kDevicePathEthernet; if (type == shill::kTypeWifi) return kDevicePathWifi; if (type == shill::kTypeCellular) diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc index f9b0994..8bb79e2 100644 --- a/chromeos/network/network_state_handler.cc +++ b/chromeos/network/network_state_handler.cc @@ -400,8 +400,8 @@ const FavoriteState* NetworkStateHandler::GetEAPForEthernet( NET_LOG_ERROR( "GetEAPForEthernet", base::StringPrintf("Unknown device %s of connected ethernet service %s", - service_path.c_str(), - network->device_path().c_str())); + network->device_path().c_str(), + service_path.c_str())); return NULL; } if (!device->eap_authentication_completed()) |