| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/proxy/proxy_config.h" | 5 #include "net/proxy/proxy_config.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/string_tokenizer.h" | 8 #include "base/string_tokenizer.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 const ProxyBypassRules& bypass = proxy_rules_.bypass_rules; | 235 const ProxyBypassRules& bypass = proxy_rules_.bypass_rules; |
| 236 if (!bypass.rules().empty()) { | 236 if (!bypass.rules().empty()) { |
| 237 if (proxy_rules_.reverse_bypass) | 237 if (proxy_rules_.reverse_bypass) |
| 238 dict->SetBoolean("reverse_bypass", true); | 238 dict->SetBoolean("reverse_bypass", true); |
| 239 | 239 |
| 240 ListValue* list = new ListValue(); | 240 ListValue* list = new ListValue(); |
| 241 | 241 |
| 242 for (ProxyBypassRules::RuleList::const_iterator it = | 242 for (ProxyBypassRules::RuleList::const_iterator it = |
| 243 bypass.rules().begin(); | 243 bypass.rules().begin(); |
| 244 it != bypass.rules().end(); ++it) { | 244 it != bypass.rules().end(); ++it) { |
| 245 list->Append(Value::CreateStringValue((*it)->ToString())); | 245 list->Append(base::StringValue::New((*it)->ToString())); |
| 246 } | 246 } |
| 247 | 247 |
| 248 dict->Set("bypass_list", list); | 248 dict->Set("bypass_list", list); |
| 249 } | 249 } |
| 250 } | 250 } |
| 251 | 251 |
| 252 return dict; | 252 return dict; |
| 253 } | 253 } |
| 254 | 254 |
| 255 } // namespace net | 255 } // namespace net |
| OLD | NEW |