OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/dhcp_proxy_script_adapter_fetcher_win.h" | 5 #include "net/proxy/dhcp_proxy_script_adapter_fetcher_win.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 NULL, | 254 NULL, |
255 const_cast<LPWSTR>(adapter_name_wide.c_str()), | 255 const_cast<LPWSTR>(adapter_name_wide.c_str()), |
256 NULL, | 256 NULL, |
257 send_params, request_params, | 257 send_params, request_params, |
258 result_buffer.get(), &result_buffer_size, | 258 result_buffer.get(), &result_buffer_size, |
259 NULL); | 259 NULL); |
260 ++retry_count; | 260 ++retry_count; |
261 } while (res == ERROR_MORE_DATA && retry_count <= 3); | 261 } while (res == ERROR_MORE_DATA && retry_count <= 3); |
262 | 262 |
263 if (res != NO_ERROR) { | 263 if (res != NO_ERROR) { |
264 LOG(INFO) << "Error fetching PAC URL from DHCP: " << res; | 264 VLOG(0) << "Error fetching PAC URL from DHCP: " << res; |
265 UMA_HISTOGRAM_COUNTS("Net.DhcpWpadUnhandledDhcpError", 1); | 265 UMA_HISTOGRAM_COUNTS("Net.DhcpWpadUnhandledDhcpError", 1); |
266 } else if (wpad_params.nBytesData) { | 266 } else if (wpad_params.nBytesData) { |
267 return SanitizeDhcpApiString( | 267 return SanitizeDhcpApiString( |
268 reinterpret_cast<const char*>(wpad_params.Data), | 268 reinterpret_cast<const char*>(wpad_params.Data), |
269 wpad_params.nBytesData); | 269 wpad_params.nBytesData); |
270 } | 270 } |
271 | 271 |
272 return ""; | 272 return ""; |
273 } | 273 } |
274 | 274 |
(...skipping 11 matching lines...) Expand all Loading... |
286 // first null in case of embedded NULLs; this is the outer | 286 // first null in case of embedded NULLs; this is the outer |
287 // constructor that takes the result of c_str() on the inner. If | 287 // constructor that takes the result of c_str() on the inner. If |
288 // the server is giving us back a buffer with embedded NULLs, | 288 // the server is giving us back a buffer with embedded NULLs, |
289 // something is broken anyway. Finally, trim trailing whitespace. | 289 // something is broken anyway. Finally, trim trailing whitespace. |
290 std::string result(std::string(data, count_bytes).c_str()); | 290 std::string result(std::string(data, count_bytes).c_str()); |
291 TrimWhitespaceASCII(result, TRIM_TRAILING, &result); | 291 TrimWhitespaceASCII(result, TRIM_TRAILING, &result); |
292 return result; | 292 return result; |
293 } | 293 } |
294 | 294 |
295 } // namespace net | 295 } // namespace net |
OLD | NEW |