| Index: chrome/test/testing_profile.cc
|
| diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
|
| index 3c37562e4a1c261afd91672cd38f8df4f88beacc..7708c0f4bace41cb47f4407036651403a5a93879 100644
|
| --- a/chrome/test/testing_profile.cc
|
| +++ b/chrome/test/testing_profile.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.
|
|
|
| @@ -114,7 +114,7 @@ class BookmarkLoadObserver : public BookmarkModelObserver {
|
| DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver);
|
| };
|
|
|
| -class TestExtensionURLRequestContext : public URLRequestContext {
|
| +class TestExtensionURLRequestContext : public net::URLRequestContext {
|
| public:
|
| TestExtensionURLRequestContext() {
|
| net::CookieMonster* cookie_monster = new net::CookieMonster(NULL, NULL);
|
| @@ -126,7 +126,7 @@ class TestExtensionURLRequestContext : public URLRequestContext {
|
|
|
| class TestExtensionURLRequestContextGetter : public URLRequestContextGetter {
|
| public:
|
| - virtual URLRequestContext* GetURLRequestContext() {
|
| + virtual net::URLRequestContext* GetURLRequestContext() {
|
| if (!context_)
|
| context_ = new TestExtensionURLRequestContext();
|
| return context_.get();
|
| @@ -136,7 +136,7 @@ class TestExtensionURLRequestContextGetter : public URLRequestContextGetter {
|
| }
|
|
|
| private:
|
| - scoped_refptr<URLRequestContext> context_;
|
| + scoped_refptr<net::URLRequestContext> context_;
|
| };
|
|
|
| } // namespace
|
|
|