Cleanup: Pass std::string as const reference from chromeos/

chromeos/dbus/fake_shill_manager_client.cc

 // Copyright 2013 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 "chromeos/dbus/fake_shill_manager_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 1097 matching lines @@
       s_tdls_busy_count = 1;
     return true;
   } else if (arg0 == "roaming") {
     // "home", "roaming", or "required"
     roaming_state_ = arg1;
     return true;
   }
   return SetInitialNetworkState(arg0, arg1);
 }
 
-bool FakeShillManagerClient::SetInitialNetworkState(std::string type_arg,
-                                                    std::string state_arg) {
+bool FakeShillManagerClient::SetInitialNetworkState(
+    const std::string& type_arg,
+    const std::string& state_arg) {
   int state_arg_as_int = -1;
   base::StringToInt(state_arg, &state_arg_as_int);
 
   std::string state;
   if (state_arg.empty() || state_arg == "1" || state_arg == "on" ||
       state_arg == "enabled" || state_arg == "connected" ||
       state_arg == "online") {
     // Enabled and connected (default value)
     state = shill::kStateOnline;
   } else if (state_arg == "0" || state_arg == "off" ||
@@ skipping 29 matching lines @@
                << state_arg;
     return false;
   }
 
   // Special cases
   if (type_arg == "wireless") {
     shill_initial_state_map_[shill::kTypeWifi] = state;
     shill_initial_state_map_[shill::kTypeCellular] = state;
     return true;
   }
-  // Convenience synonyms.
-  if (type_arg == "eth")
-    type_arg = shill::kTypeEthernet;
 
   if (type_arg != shill::kTypeEthernet &&
+      type_arg != "eth" && // synonym for KTypeEthernet

[Daniel Erat, 2015/09/21 21:47:05]

this is different behavior than what was there before. the old code mapped "eth"
to kTypeEthernet, but you're not doing that now, so the next if condition will
no longer trigger for "eth".

[ki.stfu, 2015/09/21 22:20:40]

Done.

       type_arg != shill::kTypeWifi &&
       type_arg != shill::kTypeCellular &&
       type_arg != shill::kTypeWimax &&
       type_arg != shill::kTypeVPN) {
     LOG(WARNING) << "Unrecognized Shill network type: " << type_arg;
     return false;
   }
 
   // Disabled ethernet is the same as unavailable.
   if (type_arg == shill::kTypeEthernet && state == kNetworkDisabled)

[stevenjb, 2015/09/21 22:23:39]

Need to update this condition also. I think it would be easier to leave this as
it was or copy type_arg = type_arg_in if there is some auditing reason why
changing this is important?

[ki.stfu, 2015/09/21 22:55:57]

I have already reverted it back.

     state = kTechnologyUnavailable;
 
   shill_initial_state_map_[type_arg] = state;
   return true;
 }
 
 std::string FakeShillManagerClient::GetInitialStateForType(
     const std::string& type,
     bool* enabled) {
   std::string result;
@@ skipping 16 matching lines @@
       LOG(WARNING) << "Invalid state: " << state << " for " << type;
       result = shill::kStateIdle;
     }
   }
   VLOG(1) << "Initial state for: " << type << " = " << result
           << " Enabled: " << *enabled;
   return result;
 }
 
 }  // namespace chromeos