Simplify mojo_shell since it's now only used for Mandoline.

mojo/services/network/url_loader_impl_apptest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "mojo/application/application_test_base_chromium.h"
 #include "mojo/common/message_pump_mojo.h"
-#include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/services/network/network_context.h"
 #include "mojo/services/network/url_loader_impl.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace mojo {
 
@@ skipping 239 matching lines @@
 
   EXPECT_TRUE(IsUrlLoaderValid());
 
   g_current_job->NotifyReadComplete(-1);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(IsUrlLoaderValid());
 }
 
 }  // namespace mojo