Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: mojo/shell/shell_test_base_unittest.cc

Issue 668483002: Change mojo URLs from mojo://mojo_foo to mojo://foo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/shell/shell_test_base_unittest.cc
diff --git a/mojo/shell/shell_test_base_unittest.cc b/mojo/shell/shell_test_base_unittest.cc
index 8a0bdd4967e14367055854e4bc5c8958b9557a6c..9b1a6c15258f99af24a3517704502f6f85093cc2 100644
--- a/mojo/shell/shell_test_base_unittest.cc
+++ b/mojo/shell/shell_test_base_unittest.cc
@@ -52,13 +52,10 @@ class ShellTestBaseTest : public ShellTestBase {
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)));
@@ -227,13 +224,13 @@ 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();
@@ -278,7 +275,7 @@ TEST_F(ShellTestBaseTest, ConnectManyClientsAndServices) {
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();

Powered by Google App Engine
This is Rietveld 408576698