Documents what ApplicationManager::Delegate do

And renames one to better indicate what it is expected to do.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/1052103005

Cr-Commit-Position: refs/heads/master@{#326847}

6 files changed, 20 insertions, 26 deletions

diff --git a/mojo/shell/application_manager/application_manager.cc b/mojo/shell/application_manager/application_manager.cc
index 8c908a7..81029d0 100644
--- a/mojo/shell/application_manager/application_manager.cc
+++ b/mojo/shell/application_manager/application_manager.cc
@@ -31,17 +31,6 @@ bool has_created_instance = false;
 
 }  // namespace
 
-ApplicationManager::Delegate::~Delegate() {
-}
-
-GURL ApplicationManager::Delegate::ResolveURL(const GURL& url) {
-  return url;
-}
-
-GURL ApplicationManager::Delegate::ResolveMappings(const GURL& url) {
-  return url;
-}
-
 class ApplicationManager::ContentHandlerConnection : public ErrorHandler {
  public:
   ContentHandlerConnection(ApplicationManager* manager,
@@ -136,7 +125,7 @@ void ApplicationManager::ConnectToApplicationWithParameters(
     return;
   }
 
-  GURL resolved_url = delegate_->ResolveURL(mapped_url);
+  GURL resolved_url = delegate_->ResolveMojoURL(mapped_url);
   if (ConnectToRunningApplication(resolved_url, requestor_url, &services,
                                   &exposed_services)) {
     return;
@@ -411,7 +400,8 @@ void ApplicationManager::SetNativeOptionsForURL(
     const GURL& url) {
   DCHECK(!url.has_query());  // Precondition.
   // Apply mappings and resolution to get the resolved URL.
-  GURL resolved_url = delegate_->ResolveURL(delegate_->ResolveMappings(url));
+  GURL resolved_url =
+      delegate_->ResolveMojoURL(delegate_->ResolveMappings(url));
   DCHECK(!resolved_url.has_query());  // Still shouldn't have query.
   // TODO(vtl): We should probably also remove/disregard the query string (and
   // maybe canonicalize in other ways).
diff --git a/mojo/shell/application_manager/application_manager.h b/mojo/shell/application_manager/application_manager.h
index 44e581d..3ce1599 100644
--- a/mojo/shell/application_manager/application_manager.h
+++ b/mojo/shell/application_manager/application_manager.h
@@ -36,9 +36,16 @@ class ApplicationManager {
  public:
   class Delegate {
    public:
-    virtual ~Delegate();
-    virtual GURL ResolveURL(const GURL& url);
-    virtual GURL ResolveMappings(const GURL& url);
+    // Gives the delegate a chance to apply any mappings for the specified url.
+    // This should not resolve 'mojo' urls, that is done by ResolveMojoURL().
+    virtual GURL ResolveMappings(const GURL& url) = 0;
+
+    // Used to map a url with the scheme 'mojo' to the appropriate url. Return
+    // |url| if the scheme is not 'mojo'.
+    virtual GURL ResolveMojoURL(const GURL& url) = 0;
+
+   protected:
+    virtual ~Delegate() {}
   };
 
   // API for testing.
diff --git a/mojo/shell/application_manager/application_manager_unittest.cc b/mojo/shell/application_manager/application_manager_unittest.cc
index f801e36..d425f5a 100644
--- a/mojo/shell/application_manager/application_manager_unittest.cc
+++ b/mojo/shell/application_manager/application_manager_unittest.cc
@@ -402,9 +402,7 @@ class TestDelegate : public ApplicationManager::Delegate {
       return it->second;
     return url;
   }
-
-  // ApplicationManager::Delegate
-  GURL ResolveURL(const GURL& url) override {
+  GURL ResolveMojoURL(const GURL& url) override {
     GURL mapped_url = ResolveMappings(url);
     // The shell automatically map mojo URLs.
     if (mapped_url.scheme() == "mojo") {
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index f938980..593dd1d 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -285,14 +285,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());
diff --git a/mojo/shell/context.h b/mojo/shell/context.h
index 4be704e..e1073f3 100644
--- a/mojo/shell/context.h
+++ b/mojo/shell/context.h
@@ -63,8 +63,8 @@ class Context : public ApplicationManager::Delegate,
   class NativeViewportApplicationLoader;
 
   // ApplicationManager::Delegate overrides.
-  GURL ResolveURL(const GURL& url) override;
   GURL ResolveMappings(const GURL& url) override;
+  GURL ResolveMojoURL(const GURL& url) override;
 
   // ProcessDelegate implementation.
   void OnShutdownComplete() override;
diff --git a/mojo/shell/native_runner_unittest.cc b/mojo/shell/native_runner_unittest.cc
index 4b8b5a0..4cbb4f5 100644
--- a/mojo/shell/native_runner_unittest.cc
+++ b/mojo/shell/native_runner_unittest.cc
@@ -78,9 +78,8 @@ class NativeApplicationLoaderTest : public testing::Test,
 
  private:
   // ApplicationManager::Delegate
-  GURL ResolveURL(const GURL& url) override { return url; }
-
   GURL ResolveMappings(const GURL& url) override { return url; }
+  GURL ResolveMojoURL(const GURL& url) override { return url; }
 };
 
 TEST_F(NativeApplicationLoaderTest, DoesNotExist) {