Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

examples/location/geocoder_demo.js

 #!mojo mojo:js_content_handler
-// Demonstate a Mojo wrapper for the Geocoder JSON API. The application
+// Copyright 2014 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.
+
+// Demonstrate a Mojo wrapper for the Geocoder JSON API. The application
 // connects to geocoder_service.js which implements geocoder.mojom.
 // To run this application with mojo_shell, set DIR to be the absolute path
 // for this directory, then:
 //   mojo_shell file://$DIR/demo.js
 
 define("main", [
   "console",
   "mojo/public/js/core",
   "mojo/public/js/unicode",
-  "mojo/services/location/public/interfaces/geocoder.mojom",
-  "mojo/services/location/public/interfaces/location.mojom",
+  "mojo/services/location/interfaces/geocoder.mojom",
+  "mojo/services/location/interfaces/location.mojom",
   "mojo/services/public/js/application",
   "third_party/js/url",
 ], function(console, core, unicode, geocoder, location, application, url) {
 
   const Application = application.Application;
   const Geocoder = geocoder.Geocoder;
   const Result = geocoder.Result;
   const Location = location.Location;
   const Status = geocoder.Status;
   const Options = geocoder.Options;
@@ skipping 49 matching lines @@
       var geocoderURL = new URL(this.url).resolve(
           "../../services/location/geocoder_service.js");
       geocoderService = this.shell.connectToService(geocoderURL, Geocoder);
       demoAddressToLocation();
     }
   }
 
   return Demo;
 });