| Index: chrome/service/net/service_url_request_context.cc
|
| diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
|
| index 46d3b7c35774a83f66f92c1360f96e0fdd13204f..e655489a8271dc923f3de5d6958690464c4420bf 100644
|
| --- a/chrome/service/net/service_url_request_context.cc
|
| +++ b/chrome/service/net/service_url_request_context.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -148,7 +148,7 @@ const std::string& ServiceURLRequestContext::GetUserAgent(
|
| // If the user agent is set explicitly return that, otherwise call the
|
| // base class method to return default value.
|
| return user_agent_.empty() ?
|
| - URLRequestContext::GetUserAgent(url) : user_agent_;
|
| + net::URLRequestContext::GetUserAgent(url) : user_agent_;
|
| }
|
|
|
| ServiceURLRequestContext::~ServiceURLRequestContext() {
|
| @@ -166,7 +166,7 @@ ServiceURLRequestContextGetter::ServiceURLRequestContextGetter()
|
| user_agent_ = MakeUserAgentForServiceProcess();
|
| }
|
|
|
| -URLRequestContext*
|
| +net::URLRequestContext*
|
| ServiceURLRequestContextGetter::GetURLRequestContext() {
|
| if (!url_request_context_)
|
| url_request_context_ = new ServiceURLRequestContext(user_agent_);
|
|
|