| Index: chrome/test/base/testing_profile.cc
|
| diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
|
| index 5b05335815b502ec37051c90e26045ded7dfbfef..7a68a9238d0acb0d1341550cddc79a1acbbd215c 100644
|
| --- a/chrome/test/base/testing_profile.cc
|
| +++ b/chrome/test/base/testing_profile.cc
|
| @@ -657,7 +657,8 @@ net::URLRequestContextGetter* TestingProfile::GetRequestContextForIsolatedApp(
|
| return GetRequestContext();
|
| }
|
|
|
| -content::ResourceContext* TestingProfile::GetResourceContext() {
|
| +content::ResourceContext* TestingProfile::GetResourceContext(
|
| + content::SiteInstance* instance) {
|
| if (!resource_context_.get())
|
| resource_context_.reset(new content::MockResourceContext());
|
| return resource_context_.get();
|
| @@ -815,5 +816,3 @@ scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
|
| pref_service_.Pass(),
|
| user_cloud_policy_manager_.Pass()));
|
| }
|
| -
|
| -
|
|
|