| Index: net/proxy/proxy_script_fetcher_impl.cc
|
| diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc
|
| index 0887d8c362b78942aa6744463291f418f31528dd..ce4d539482acedd5989ecc4315c8f5496b09a6e8 100644
|
| --- a/net/proxy/proxy_script_fetcher_impl.cc
|
| +++ b/net/proxy/proxy_script_fetcher_impl.cc
|
| @@ -35,9 +35,8 @@ const int kDefaultMaxDurationMs = 300000; // 5 minutes
|
|
|
| // Returns true if |mime_type| is one of the known PAC mime type.
|
| bool IsPacMimeType(const std::string& mime_type) {
|
| - static const char * const kSupportedPacMimeTypes[] = {
|
| - "application/x-ns-proxy-autoconfig",
|
| - "application/x-javascript-config",
|
| + static const char* const kSupportedPacMimeTypes[] = {
|
| + "application/x-ns-proxy-autoconfig", "application/x-javascript-config",
|
| };
|
| for (size_t i = 0; i < arraysize(kSupportedPacMimeTypes); ++i) {
|
| if (LowerCaseEqualsASCII(mime_type, kSupportedPacMimeTypes[i]))
|
| @@ -65,9 +64,8 @@ void ConvertResponseToUTF16(const std::string& charset,
|
| // We will be generous in the conversion -- if any characters lie
|
| // outside of |charset| (i.e. invalid), then substitute them with
|
| // U+FFFD rather than failing.
|
| - base::CodepageToUTF16(bytes, codepage,
|
| - base::OnStringConversionError::SUBSTITUTE,
|
| - utf16);
|
| + base::CodepageToUTF16(
|
| + bytes, codepage, base::OnStringConversionError::SUBSTITUTE, utf16);
|
| }
|
|
|
| } // namespace
|
| @@ -115,8 +113,9 @@ void ProxyScriptFetcherImpl::OnResponseCompleted(URLRequest* request) {
|
| FetchCompleted();
|
| }
|
|
|
| -int ProxyScriptFetcherImpl::Fetch(
|
| - const GURL& url, base::string16* text, const CompletionCallback& callback) {
|
| +int ProxyScriptFetcherImpl::Fetch(const GURL& url,
|
| + base::string16* text,
|
| + const CompletionCallback& callback) {
|
| // It is invalid to call Fetch() while a request is already in progress.
|
| DCHECK(!cur_request_.get());
|
| DCHECK(!callback.is_null());
|
|
|