Remove hardcoded tests URLs from apptests.

services/view_manager/view_manager_client_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 "mojo/services/view_manager/public/cpp/view_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/geometry/public/cpp/geometry_util.h"
 #include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_context.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 
 namespace mojo {
 
 namespace {
 
-const char kViewManagerClientTestAppURL[] =
-    "mojo:mojo_view_manager_client_apptests";
-
 base::RunLoop* current_run_loop = nullptr;
 
 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) {
   CHECK(current_run_loop);
   *timeout = true;
   timeout_task.Run();
 }
 
 bool DoRunLoopWithTimeout() {
   if (current_run_loop != nullptr)
@@ skipping 156 matching lines @@
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   ViewManager* window_manager() { return window_manager_; }
 
   // Embeds another version of the test app @ view; returns nullptr on timeout.
   ViewManager* Embed(ViewManager* view_manager, View* view) {
     DCHECK_EQ(view_manager, view->view_manager());
     most_recent_view_manager_ = nullptr;
-    view->Embed(kViewManagerClientTestAppURL);
+    view->Embed(application_impl()->url());
     if (!DoRunLoopWithTimeout())
       return nullptr;
     ViewManager* vm = nullptr;
     std::swap(vm, most_recent_view_manager_);
     return vm;
   }
 
   ApplicationDelegate* GetApplicationDelegate() override { return this; }
 
   // Overridden from ViewManagerDelegate:
   void OnEmbed(View* root,
                InterfaceRequest<ServiceProvider> services,
                ServiceProviderPtr exposed_services) override {
     most_recent_view_manager_ = root->view_manager();
     QuitRunLoop();
   }
   void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
     view_manager_context_.reset(new ViewManagerContext(application_impl()));
-    view_manager_context_->Embed(kViewManagerClientTestAppURL);
+    view_manager_context_->Embed(application_impl()->url());
     ASSERT_TRUE(DoRunLoopWithTimeout());
     std::swap(window_manager_, most_recent_view_manager_);
   }
 
   // Overridden from testing::Test:
   void TearDown() override { ApplicationTestBase::TearDown(); }
 
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   scoped_ptr<ViewManagerContext> view_manager_context_;
@@ skipping 135 matching lines @@
   ASSERT_NE(nullptr, embedded2);
   EXPECT_NE(embedded1, embedded2);
 }
 
 TEST_F(ViewManagerTest, EmbeddingIdentity) {
   View* view = window_manager()->CreateView();
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
   ASSERT_NE(nullptr, embedded);
-  EXPECT_EQ(kViewManagerClientTestAppURL, embedded->GetEmbedderURL());
+  EXPECT_EQ(application_impl()->url(), embedded->GetEmbedderURL());
 }
 
 // TODO(alhaad): Currently, the RunLoop gets stuck waiting for order change.
 // Debug and re-enable this.
 TEST_F(ViewManagerTest, DISABLED_Reorder) {
   View* view1 = window_manager()->CreateView();
   view1->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view1);
 
   ViewManager* embedded = Embed(window_manager(), view1);
@@ skipping 206 matching lines @@
     view11->SetFocus();
     ASSERT_TRUE(DoRunLoopWithTimeout());
     ASSERT_NE(nullptr, observer.last_gained_focus());
     ASSERT_NE(nullptr, observer.last_lost_focus());
     EXPECT_EQ(view11->id(), observer.last_gained_focus()->id());
     EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id());
   }
 }
 
 }  // namespace mojo