Remove hardcoded tests URLs from apptests.

mojo/public/cpp/application/lib/application_test_base.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 "mojo/public/cpp/application/application_test_base.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 // Share the application command-line arguments with multiple application tests.
 Array<String> g_args;
 
+String g_url;

[viettrungluu, 2015/03/10 15:31:52]

No comment?

(Also, the seemingly-random order of declaration of the globals and
initialization/copying in Initialize() below -- not corresponding to (e.g.)
argument order or anything) -- triggers my OCD. But since that's a existing
condition, feel free to ignore me.)

[Nick Bray (chromium), 2015/03/10 19:39:00]

Done.

+
 // Application request handle passed from the shell in MojoMain, stored in
 // between SetUp()/TearDown() so we can (re-)intialize new ApplicationImpls.
 InterfaceRequest<Application> g_application_request;
 
 // Shell pointer passed in the initial mojo.Application.Initialize() call,
 // stored in between initial setup and the first test and between SetUp/TearDown
 // calls so we can (re-)initialize new ApplicationImpls.
 ShellPtr g_shell;
 
 void InitializeArgs(int argc, std::vector<const char*> argv) {
@@ skipping 14 matching lines @@
     // Initialize is always the first call made on Application.
     MOJO_CHECK(binding_.WaitForIncomingMethodCall());
   }
 
  private:
   // Application implementation.
   void Initialize(ShellPtr shell,
                   Array<String> args,
                   const mojo::String& url) override {
     *args_ = args.Pass();
+    g_url = url;
     g_application_request = binding_.Unbind();
     g_shell = shell.Pass();
   }
 
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services,
                         const String& url) override {
     MOJO_CHECK(false);
   }
 
   void RequestQuit() override { MOJO_CHECK(false); }
 
   Array<String>* args_;
   Binding<Application> binding_;
 };
 
 }  // namespace
 
 const Array<String>& Args() {
   return g_args;
 }
 
+const String& Url() {
+  return g_url;
+}
+
 MojoResult RunAllTests(MojoHandle application_request_handle) {
   {
     // This loop is used for init, and then destroyed before running tests.
     Environment::InstantiateDefaultRunLoop();
 
     // Grab the shell handle and GTEST commandline arguments.
     // GTEST command line arguments are supported amid application arguments:
     // $ mojo_shell mojo:example_apptests
     //   --args-for='mojo:example_apptests arg1 --gtest_filter=foo arg2'
     Array<String> args;
@@ skipping 46 matching lines @@
     Environment::InstantiateDefaultRunLoop();
 
   MOJO_CHECK(g_application_request.is_pending());
   MOJO_CHECK(g_shell);
 
   // New applications are constructed for each test to avoid persisting state.
   application_impl_ = new ApplicationImpl(GetApplicationDelegate(),
                                           g_application_request.Pass());
 
   // Fake application initialization with the given command line arguments.
-  application_impl_->Initialize(g_shell.Pass(), g_args.Clone(), "");
+  application_impl_->Initialize(g_shell.Pass(), g_args.Clone(), g_url);

[viettrungluu, 2015/03/10 15:31:52]

I agree that this is probably right, and that passing the empty string was a
bug.

 }
 
 void ApplicationTestBase::TearDown() {
   MOJO_CHECK(!g_application_request.is_pending());
   MOJO_CHECK(!g_shell);
 
   application_impl_->UnbindConnections(&g_application_request, &g_shell);
   delete application_impl_;
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo