Cleanup mojo_shell and sample_app a bit

mojo/shell/app_container.h

Index: mojo/shell/app_container.h
diff --git a/mojo/shell/app_container.h b/mojo/shell/app_container.h
index 59bc697e097fd5256840f8e56b82d72339d6bd5f..a2691e81b91fa4bed8b41b25c6699cf151550b9d 100644
--- a/mojo/shell/app_container.h
+++ b/mojo/shell/app_container.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/loader/job.h"
 #include "mojo/public/system/core.h"
+#include "mojo/shell/loader.h"
 
 namespace base {
 class FilePath;
@@ -22,7 +22,7 @@ namespace shell {
 class Context;
 
 // A container class that runs an app on its own thread.
-class AppContainer : public loader::Job::Delegate {
+class AppContainer : public Loader::Delegate {
  public:
   explicit AppContainer(Context* context);
   virtual ~AppContainer();
@@ -30,14 +30,14 @@ class AppContainer : public loader::Job::Delegate {
   void Load(const GURL& app_url);
 
  private:
-  // From loader::Job::Delegate
+  // From Loader::Delegate
   virtual void DidCompleteLoad(const GURL& app_url,
                                const base::FilePath& app_path) OVERRIDE;
 
   void AppCompleted();
 
   Context* context_;
-  scoped_ptr<loader::Job> request_;
+  scoped_ptr<Loader::Job> request_;
   scoped_ptr<base::Thread> thread_;
 
   // Following members are valid only on app thread.