Address codereview comments for http://crrev.com/22295002

chrome/utility/networking_private_handler.cc

Index: chrome/utility/networking_private_handler.cc
diff --git a/chrome/utility/networking_private_handler.cc b/chrome/utility/networking_private_handler.cc
index ea08527d04a53c67c84213021318b79edd2eb776..13a8254fddcc2362eb223ecdbca19a3ef1174128 100644
--- a/chrome/utility/networking_private_handler.cc
+++ b/chrome/utility/networking_private_handler.cc
@@ -19,10 +19,10 @@ namespace chrome {
 NetworkingPrivateHandler::NetworkingPrivateHandler()
     : wifi_service_(WiFiService::CreateService()) {
   wifi_service_->SetNetworksChangedObserver(
-      base::Bind(&NetworkingPrivateHandler::OnNetworksChangedEvent,
+      base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent,
                  base::Unretained(this)));
   wifi_service_->SetNetworkListChangedObserver(
-      base::Bind(&NetworkingPrivateHandler::OnNetworkListChangedEvent,
+      base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent,
                  base::Unretained(this)));
 }
 
@@ -51,14 +51,14 @@ void NetworkingPrivateHandler::OnUseWiFiServiceMockForTest(
     const base::DictionaryValue& parameters) {
   wifi_service_.reset(WiFiService::CreateServiceMock());
   wifi_service_->SetNetworksChangedObserver(
-      base::Bind(&NetworkingPrivateHandler::OnNetworksChangedEvent,
+      base::Bind(&NetworkingPrivateHandler::WiFiNetworksChangedEvent,
                  base::Unretained(this)));
   wifi_service_->SetNetworkListChangedObserver(
-      base::Bind(&NetworkingPrivateHandler::OnNetworkListChangedEvent,
+      base::Bind(&NetworkingPrivateHandler::WiFiNetworkListChangedEvent,
                  base::Unretained(this)));
 }
 
-void NetworkingPrivateHandler::OnApiError(
+void NetworkingPrivateHandler::WiFiApiError(
     int message_id,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
@@ -70,15 +70,15 @@ void NetworkingPrivateHandler::OnGetPropertiesStart(
     const std::string& network_guid) {
   wifi_service_->GetProperties(
       network_guid,
-      base::Bind(&NetworkingPrivateHandler::OnGetPropertiesSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiGetPropertiesSucceeded,
                  base::Unretained(this),
                  message_id),
-      base::Bind(&NetworkingPrivateHandler::OnApiError,
+      base::Bind(&NetworkingPrivateHandler::WiFiApiError,
                  base::Unretained(this),
                  message_id));
 }
 
-void NetworkingPrivateHandler::OnGetPropertiesSucceeded(
+void NetworkingPrivateHandler::WiFiGetPropertiesSucceeded(
     int message_id,
     const std::string& network_guid,
     const WiFiService::NetworkProperties& properties) {
@@ -94,15 +94,15 @@ void NetworkingPrivateHandler::OnSetPropertiesStart(
   wifi_service_->SetProperties(
       network_guid,
       properties,
-      base::Bind(&NetworkingPrivateHandler::OnSetPropertiesSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiSetPropertiesSucceeded,
                  base::Unretained(this),
                  message_id),
-      base::Bind(&NetworkingPrivateHandler::OnApiError,
+      base::Bind(&NetworkingPrivateHandler::WiFiApiError,
                  base::Unretained(this),
                  message_id));
 }
 
-void NetworkingPrivateHandler::OnSetPropertiesSucceeded(
+void NetworkingPrivateHandler::WiFiSetPropertiesSucceeded(
     int message_id,
     const std::string& network_guid) {
   Send(new NetworkingPrivateMsg_SetProperties_Succeeded(message_id,
@@ -114,15 +114,15 @@ void NetworkingPrivateHandler::OnStartConnectStart(
     const std::string& network_guid) {
   wifi_service_->StartConnect(
       network_guid,
-      base::Bind(&NetworkingPrivateHandler::OnStartConnectSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiStartConnectSucceeded,
                  base::Unretained(this),
                  message_id),
-      base::Bind(&NetworkingPrivateHandler::OnApiError,
+      base::Bind(&NetworkingPrivateHandler::WiFiApiError,
                  base::Unretained(this),
                  message_id));
 }
 
-void NetworkingPrivateHandler::OnStartConnectSucceeded(
+void NetworkingPrivateHandler::WiFiStartConnectSucceeded(
     int message_id,
     const std::string& network_guid) {
   Send(new NetworkingPrivateMsg_StartConnect_Succeeded(message_id,
@@ -134,15 +134,15 @@ void NetworkingPrivateHandler::OnStartDisconnectStart(
     const std::string& network_guid) {
   wifi_service_->StartDisconnect(
       network_guid,
-      base::Bind(&NetworkingPrivateHandler::OnStartDisconnectSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiStartDisconnectSucceeded,
                  base::Unretained(this),
                  message_id),
-      base::Bind(&NetworkingPrivateHandler::OnApiError,
+      base::Bind(&NetworkingPrivateHandler::WiFiApiError,
                  base::Unretained(this),
                  message_id));
 }
 
-void NetworkingPrivateHandler::OnStartDisconnectSucceeded(
+void NetworkingPrivateHandler::WiFiStartDisconnectSucceeded(
     int message_id,
     const std::string& network_guid) {
   Send(new NetworkingPrivateMsg_StartDisconnect_Succeeded(message_id,
@@ -151,14 +151,14 @@ void NetworkingPrivateHandler::OnStartDisconnectSucceeded(
 
 void NetworkingPrivateHandler::OnRequestNetworkScan() {
   wifi_service_->GetVisibleNetworks(
-      base::Bind(&NetworkingPrivateHandler::OnNetworkScanSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiNetworkScanSucceeded,
                  base::Unretained(this)),
       base::Bind(
-          &NetworkingPrivateHandler::OnApiError, base::Unretained(this), 0));
+          &NetworkingPrivateHandler::WiFiApiError, base::Unretained(this), 0));
   wifi_service_->RequestNetworkScan();
 }
 
-void NetworkingPrivateHandler::OnNetworkScanSucceeded(
+void NetworkingPrivateHandler::WiFiNetworkScanSucceeded(
     const WiFiService::NetworkList& network_list) {
   std::vector<std::string> list;
   for (WiFiService::NetworkList::const_iterator it = network_list.begin();
@@ -172,15 +172,15 @@ void NetworkingPrivateHandler::OnNetworkScanSucceeded(
 
 void NetworkingPrivateHandler::OnGetVisibleNetworks(int message_id) {
   wifi_service_->GetVisibleNetworks(
-      base::Bind(&NetworkingPrivateHandler::OnGetVisibleNetworksSucceeded,
+      base::Bind(&NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded,
                  base::Unretained(this),
                  message_id),
-      base::Bind(&NetworkingPrivateHandler::OnApiError,
+      base::Bind(&NetworkingPrivateHandler::WiFiApiError,
                  base::Unretained(this),
                  message_id));
 }
 
-void NetworkingPrivateHandler::OnGetVisibleNetworksSucceeded(
+void NetworkingPrivateHandler::WiFiGetVisibleNetworksSucceeded(
     int message_id,
     const WiFiService::NetworkList& network_list) {
   scoped_ptr<ListValue> visible_networks(new ListValue());
@@ -199,14 +199,14 @@ bool NetworkingPrivateHandler::Send(IPC::Message* message) {
   return content::UtilityThread::Get()->Send(message);
 }
 
-void NetworkingPrivateHandler::OnNetworkListChangedEvent(
+void NetworkingPrivateHandler::WiFiNetworkListChangedEvent(
     const WiFiService::NetworkGuidList& network_guid_list) {
   std::vector<std::string> networks(network_guid_list.begin(),
                                     network_guid_list.end());
   Send(new NetworkingPrivateMsg_NetworkListChanged_Event(networks));
 }
 
-void NetworkingPrivateHandler::OnNetworksChangedEvent(
+void NetworkingPrivateHandler::WiFiNetworksChangedEvent(
     const WiFiService::NetworkGuidList& network_guid_list) {
   std::vector<std::string> networks(network_guid_list.begin(),
                                     network_guid_list.end());