| Index: chrome/browser/chrome_plugin_browsing_context.cc
|
| diff --git a/chrome/browser/chrome_plugin_browsing_context.cc b/chrome/browser/chrome_plugin_browsing_context.cc
|
| index 3ff47295085e3b05bf151dd05324fbbcd3a22321..a252bbf18b4d1ec312987af03009b4557b71e6b8 100644
|
| --- a/chrome/browser/chrome_plugin_browsing_context.cc
|
| +++ b/chrome/browser/chrome_plugin_browsing_context.cc
|
| @@ -23,17 +23,18 @@ CPBrowsingContextManager::~CPBrowsingContextManager() {
|
| }
|
|
|
| CPBrowsingContext CPBrowsingContextManager::Allocate(
|
| - URLRequestContext* context) {
|
| + net::URLRequestContext* context) {
|
| int32 map_id = map_.Add(context);
|
| return static_cast<CPBrowsingContext>(map_id);
|
| }
|
|
|
| -URLRequestContext* CPBrowsingContextManager::ToURLRequestContext(
|
| +net::URLRequestContext* CPBrowsingContextManager::ToURLRequestContext(
|
| CPBrowsingContext id) {
|
| return map_.Lookup(static_cast<int32>(id));
|
| }
|
|
|
| -CPBrowsingContext CPBrowsingContextManager::Lookup(URLRequestContext* context) {
|
| +CPBrowsingContext CPBrowsingContextManager::Lookup(
|
| + net::URLRequestContext* context) {
|
| ReverseMap::const_iterator it = reverse_map_.find(context);
|
| if (it == reverse_map_.end()) {
|
| CPBrowsingContext id = Allocate(context);
|
| @@ -49,7 +50,8 @@ void CPBrowsingContextManager::Observe(NotificationType type,
|
| const NotificationDetails& details) {
|
| DCHECK(type == NotificationType::URL_REQUEST_CONTEXT_RELEASED);
|
|
|
| - URLRequestContext* context = Source<URLRequestContext>(source).ptr();
|
| + net::URLRequestContext* context =
|
| + Source<net::URLRequestContext>(source).ptr();
|
|
|
| // Multiple CPBrowsingContexts may refer to the same URLRequestContext.
|
| for (Map::iterator it(&map_); !it.IsAtEnd(); it.Advance()) {
|
|
|