Cleanup mojo_shell and sample_app a bit

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'defines': ['MOJO_IMPLEMENTATION'],
@@ skipping 123 matching lines @@
     {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_system',
       ],
       'sources': [
-        'loader/job.cc',
-        'loader/job.h',
-        'loader/loader.cc',
-        'loader/loader.h',
-        'loader/url_request_context_getter.cc',
-        'loader/url_request_context_getter.h',
         'shell/app_container.cc',
         'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
+        'shell/loader.cc',
+        'shell/loader.h',
         'shell/run.cc',
         'shell/run.h',
         'shell/storage.cc',
         'shell/storage.h',
         'shell/switches.cc',
         'shell/switches.h',
         'shell/task_runners.cc',
         'shell/task_runners.h',
+        'shell/url_request_context_getter.cc',
+        'shell/url_request_context_getter.h',
       ],
       'conditions': [
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [
             4267,
           ],
         }],
       ],
     },
@@ skipping 19 matching lines @@
       ],
     },
     {
       'target_name': 'sample_app',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         'mojo_system',
       ],
       'sources': [
-        'shell/sample_app.cc',
+        'examples/sample_app/sample_app.cc',
       ],
     },
     {
       'target_name': 'mojo_bindings',
       'type': 'static_library',
       'include_dirs': [
         '..'
       ],
       'sources': [
         'public/bindings/lib/bindings.h',
@@ skipping 43 matching lines @@
           'type': 'none',
           'dependencies': [
             'java_set_jni_headers',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/mojo',
             ],
           },
           'sources': [
-            'shell/android/shell_apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
+            'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
           ],
           'variables': {
             'jni_gen_package': 'mojo'
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libmojo_shell',
           'type': 'shared_library',
           'dependencies': [
@@ skipping 11 matching lines @@
         {
           'target_name': 'mojo_shell_apk',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             '../net/net.gyp:net_java',
             'libmojo_shell',
           ],
           'variables': {
             'apk_name': 'MojoShell',
-            'java_in_dir': '<(DEPTH)/mojo/shell/android/shell_apk',
-            'resource_dir': '<(DEPTH)/mojo/shell/android/shell_apk/res',
+            'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
+            'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }