| Index: shell/context.cc
|
| diff --git a/shell/context.cc b/shell/context.cc
|
| index 52b77acf5c063b081a77fdb972abf5a7cfebef9f..f97d0a5df0d45cb5e15bc20e3dcbe05fda8aa57e 100644
|
| --- a/shell/context.cc
|
| +++ b/shell/context.cc
|
| @@ -304,14 +304,14 @@ void Context::Shutdown() {
|
| base::MessageLoop::current()->Run();
|
| }
|
|
|
| -GURL Context::ResolveURL(const GURL& url) {
|
| - return url_resolver_.ResolveMojoURL(url);
|
| -}
|
| -
|
| GURL Context::ResolveMappings(const GURL& url) {
|
| return url_resolver_.ApplyMappings(url);
|
| }
|
|
|
| +GURL Context::ResolveMojoURL(const GURL& url) {
|
| + return url_resolver_.ResolveMojoURL(url);
|
| +}
|
| +
|
| void Context::OnShutdownComplete() {
|
| DCHECK_EQ(base::MessageLoop::current()->task_runner(),
|
| task_runners_->shell_runner());
|
|
|