5 files changed, 20 insertions, 18 deletions

diff --git a/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java b/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java
index 3a0b237..8fecb66 100644
--- a/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java
+++ b/mojo/runner/android/apk/src/org/chromium/mojo/shell/AndroidHandler.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Constructor;
 /**
  * Content handler for archives containing native libraries bundled with Java code.
  * <p>
- * TODO(ppi): create a seperate instance for each application being bootstrapped to keep track of
+ * TODO(ppi): create a separate instance for each application being bootstrapped to keep track of
  * the temporary files and clean them up once the execution finishes.
  */
 @JNINamespace("mojo::runner")
diff --git a/mojo/runner/native_application_support.h b/mojo/runner/native_application_support.h
index f22dd40..24cc16c 100644
--- a/mojo/runner/native_application_support.h
+++ b/mojo/runner/native_application_support.h
@@ -22,7 +22,7 @@ namespace runner {
 // Loads the native Mojo application from the DSO specified by |app_path|.
 // Returns the |base::NativeLibrary| for the application on success (or null on
 // failure). If |cleanup| is |DELETE|, it will delete |app_path| (regardless of
-// sucess or failure).
+// success or failure).
 //
 // Note: The caller may choose to eventually unload the returned DSO. If so,
 // this should be done only after the thread on which |LoadNativeApplication()|
diff --git a/mojo/runner/shell_test_base.cc b/mojo/runner/shell_test_base.cc
index 2067bd5..a6b445e 100644
--- a/mojo/runner/shell_test_base.cc
+++ b/mojo/runner/shell_test_base.cc
@@ -62,7 +62,7 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService(
 void ShellTestBase::SetUpTestApplications() {
   // Set the URLResolver origin to be the same as the base file path for
   // local files. This is primarily for test convenience, so that references
-  // to unknown mojo: urls that do not have specific local file or custom
+  // to unknown mojo: URLs that do not have specific local file or custom
   // mappings registered on the URL resolver are treated as shared libraries.
   base::FilePath service_dir;
   CHECK(PathService::Get(base::DIR_MODULE, &service_dir));
diff --git a/mojo/runner/switches.cc b/mojo/runner/switches.cc
index f4290f6..e6d0b4b 100644
--- a/mojo/runner/switches.cc
+++ b/mojo/runner/switches.cc
@@ -8,8 +8,8 @@
 
 namespace switches {
 
-// Used just for debugging to make it easier to attach debuggers. The actual app
-// path that is used is sent over IPC.
+// Used just for debugging, to make it easier to attach debuggers. The actual
+// app path that is used is sent over IPC.
 const char kApp[] = "app";
 
 // Used internally by the main process to indicate that a new process should be
@@ -20,12 +20,12 @@ const char kChildProcess[] = "child-process";
 // text/html,mojo:html_viewer,application/bravo,https://abarth.com/bravo
 const char kContentHandlers[] = "content-handlers";
 
-// Force dynamically loaded apps / services to be loaded irrespective of cache
+// Force dynamically loaded apps or services to be loaded irrespective of cache
 // instructions.
 const char kDisableCache[] = "disable-cache";
 
 // In multiprocess mode, force these apps to be loaded in the main process.
-// Comma-separate list of URLs. Example:
+// This is a comma-separated list of URLs. Example:
 // --force-in-process=mojo:native_viewport_service,mojo:network_service
 const char kForceInProcess[] = "force-in-process";
 
@@ -44,9 +44,9 @@ const char kOrigin[] = "origin";
 // seconds or when the shell exits.
 const char kTraceStartup[] = "trace-startup";
 
-// Specifies a set of mappings to apply when resolving urls. The value is a set
-// of ',' separated mappings, where each mapping consists of a pair of urls
-// giving the to/from url to map. For example, 'a=b,c=d' contains two mappings,
+// Specifies a set of mappings to apply when resolving URLs. The value is a set
+// of comma-separated mappings, where each mapping consists of a pair of URLs
+// giving the to/from URLs to map. For example, 'a=b,c=d' contains two mappings,
 // the first maps 'a' to 'b' and the second 'c' to 'd'.
 const char kURLMappings[] = "url-mappings";
 
diff --git a/mojo/runner/url_resolver.h b/mojo/runner/url_resolver.h
index 35b253d..b34e854 100644
--- a/mojo/runner/url_resolver.h
+++ b/mojo/runner/url_resolver.h
@@ -17,10 +17,11 @@ namespace mojo {
 namespace runner {
 
 // This class supports the mapping of URLs to other URLs.
-// It's commonly used with mojo: URL, to provide a physical location (i.e.
-// file: or https:) but works with any URL.
+// It's commonly used with mojo: URL, to provide a physical location URL
+// (i.e. file: or https:) but works with any URL.
 // By default, "mojo:" URLs resolve to a file location, with ".mojo" appended,
-// but that resolution can be customized via the AddCustomMapping method.
+// but that resolution can be customized via the AddURLMapping and
+// AddOriginMapping methods.
 class URLResolver {
  public:
   URLResolver();
@@ -36,7 +37,7 @@ class URLResolver {
   };
 
   // Returns a list of origin mappings based on command line args.
-  // The switch --map-origin can be specified multiple times. Each occurance
+  // The switch --map-origin can be specified multiple times. Each occurrence
   // has the format of --map-origin={origin}={base_url}
   // For example:
   //   --map-origin=http://domokit.org=file:///source/out
@@ -44,19 +45,20 @@ class URLResolver {
       const base::CommandLine::StringVector& argv);
 
   // Add a custom mapping for a particular URL. If |mapped_url| is
-  // itself a mojo url normal resolution rules apply.
+  // itself a mojo URL, then normal resolution rules apply.
   void AddURLMapping(const GURL& url, const GURL& mapped_url);
 
-  // Add a custom mapping for all urls rooted at |origin|.
+  // Add a custom mapping for all URLs rooted at |origin|. An origin is a
+  // combination of URL scheme, host and port.
   void AddOriginMapping(const GURL& origin, const GURL& base_url);
 
   // Applies all custom mappings for |url|, returning the last non-mapped url.
-  // For example, if 'a' maps to 'b' and 'b' maps to 'c' calling this with 'a'
+  // For example, if 'a' maps to 'b' and 'b' maps to 'c', calling this with 'a'
   // returns 'c'.
   GURL ApplyMappings(const GURL& url) const;
 
   // If specified, then "mojo:" URLs will be resolved relative to this
-  // URL. That is, the portion after the colon will be appeneded to
+  // URL. That is, the portion after the colon will be appended to
   // |mojo_base_url| with .mojo appended.
   void SetMojoBaseURL(const GURL& mojo_base_url);