| Index: remoting/host/plugin/policy_hack/nat_policy.cc
|
| diff --git a/remoting/host/plugin/policy_hack/nat_policy.cc b/remoting/host/plugin/policy_hack/nat_policy.cc
|
| index 822e9f08b1bf8030280920d6362654574db525d6..cbcda8ab388d551310d3a96512cafa25540fee0a 100644
|
| --- a/remoting/host/plugin/policy_hack/nat_policy.cc
|
| +++ b/remoting/host/plugin/policy_hack/nat_policy.cc
|
| @@ -89,19 +89,7 @@ void NatPolicy::UpdateNatPolicy(base::DictionaryValue* new_policy) {
|
| bool new_nat_enabled_state = false;
|
| if (!new_policy->HasKey(kNatPolicyName)) {
|
| // If unspecified, the default value of this policy is true.
|
| - //
|
| - // TODO(dmaclach): Currently defaults to false on Linux until
|
| - // we have policy in place. http://crbug.com/97689
|
| -#if defined(OS_WIN)
|
| new_nat_enabled_state = true;
|
| -#elif defined(OS_MACOSX)
|
| - new_nat_enabled_state = true;
|
| -#elif defined(OS_LINUX)
|
| - new_nat_enabled_state = false;
|
| -#else
|
| - // Be conservative for now
|
| - new_nat_enabled_state = false;
|
| -#endif // defined(OS_WIN)
|
| } else {
|
| // Otherwise, try to parse the value and only change from false if we get
|
| // a successful read.
|
|
|