Change mojo URLs from mojo://mojo_foo to mojo://foo.

mojo/shell/shell_test_base_unittest.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/shell/shell_test_base.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 34 matching lines @@
   template <typename T>
   base::Callback<void()> SetAndQuit(T* val, T result) {
     return base::Bind(&ShellTestBaseTest::SetAndQuitImpl<T>,
         base::Unretained(this), val, result);
   }
   template <typename T>
   base::Callback<void(T result)> SetAndQuit(T* val) {
       return base::Bind(&ShellTestBaseTest::SetAndQuitImpl<T>,
           base::Unretained(this), val);
   }
-  static GURL test_app_url() {
-    return GURL("mojo:mojo_test_app");
-  }
+  static GURL test_app_url() { return GURL("mojo:test_app"); }
 
   void GetReport(std::vector<ServiceReport>* report) {
-    ConnectToService(GURL("mojo:mojo_test_request_tracker_app"),
-                     &request_tracking_);
+    ConnectToService(GURL("mojo:test_request_tracker_app"), &request_tracking_);
     request_tracking_->GetReport(base::Bind(&GetReportCallback,
         base::Unretained(message_loop()),
         base::Unretained(report)));
     message_loop()->Run();
   }
 
  private:
   template<typename T>
   void SetAndQuitImpl(T* val, T result) {
     *val = result;
@@ skipping 148 matching lines @@
 
   EXPECT_EQ(time_message, party_time);
 }
 
 // Tests that a service A in App 1 can talk to service B in App 2 and
 // parameters are passed around properly.
 TEST_F(ShellTestBaseTest, ConnectDifferentServicesInDifferentApps) {
   int64 time_message;
   TestServicePtr service;
   ConnectToService(test_app_url(), &service);
-  service->ConnectToAppAndGetTime("mojo:mojo_test_request_tracker_app",
+  service->ConnectToAppAndGetTime("mojo:test_request_tracker_app",
                                   SetAndQuit<int64>(&time_message));
   message_loop()->Run();
 
   // Verify by hitting the TimeService in the request tracker app directly.
   TestTimeServicePtr time_service;
-  ConnectToService(GURL("mojo:mojo_test_request_tracker_app"), &time_service);
+  ConnectToService(GURL("mojo:test_request_tracker_app"), &time_service);
   int64 party_time;
   time_service->GetPartyTime(SetAndQuit<int64>(&party_time));
   message_loop()->Run();
 
   EXPECT_EQ(time_message, party_time);
 }
 
 // Tests that service A in App 1 can be a client of service B in App 2.
 TEST_F(ShellTestBaseTest, ConnectServiceAsClientOfSeparateApp) {
   TestServicePtr service;
@@ skipping 24 matching lines @@
 
   // Make a request to the TestService and have it contact TimeService in the
   // tracking app. Do all this with tracking enabled, meaning both services
   // are connected as clients of the TrackedRequestService.
   ConnectToService(test_app_url(), &service);
   service->StartTrackingRequests(message_loop()->QuitWhenIdleClosure());
   message_loop()->Run();
   for (int i = 0; i < 5; i++)
     service->Ping(mojo::Callback<void()>());
   int64 time_result;
-  service->ConnectToAppAndGetTime("mojo:mojo_test_request_tracker_app",
+  service->ConnectToAppAndGetTime("mojo:test_request_tracker_app",
                                   SetAndQuit<int64>(&time_result));
   message_loop()->Run();
 
   // Also make a few requests to the TimeService in the test_app.
   ConnectToService(test_app_url(), &time_service);
   time_service->StartTrackingRequests(message_loop()->QuitWhenIdleClosure());
   time_service->GetPartyTime(mojo::Callback<void(uint64_t)>());
   message_loop()->Run();
   for (int i = 0; i < 18; i++)
     time_service->GetPartyTime(mojo::Callback<void(uint64_t)>());
@@ skipping 10 matching lines @@
   EXPECT_EQ(TestTimeService::Name_, reports[1].service_name);
   EXPECT_EQ(1U, reports[1].total_requests);
   EXPECT_EQ(TestTimeService::Name_, reports[2].service_name);
   EXPECT_EQ(20U, reports[2].total_requests);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo