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

Unified Diff: ui/views/mus/platform_test_helper_mus.cc

Issue 1743473002: Change Mojo URLs to structured names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@18collapse
Patch Set: . Created 4 years, 10 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
« no previous file with comments | « mojo/shell/tests/package_test_package_manifest.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/platform_test_helper_mus.cc
diff --git a/ui/views/mus/platform_test_helper_mus.cc b/ui/views/mus/platform_test_helper_mus.cc
index ba6869cf93bd4f22cf091d1fce62c4210ec9f146..891bd6a34d09e153fb5a6880f2db369a6c02697a 100644
--- a/ui/views/mus/platform_test_helper_mus.cc
+++ b/ui/views/mus/platform_test_helper_mus.cc
@@ -11,14 +11,13 @@
#include "mojo/shell/public/cpp/shell_client.h"
#include "mojo/shell/public/cpp/shell_connection.h"
#include "ui/views/mus/window_manager_connection.h"
-#include "url/gurl.h"
using mojo::shell::BackgroundShell;
namespace views {
namespace {
-const char kTestUrl[] = "mojo://test-app";
+const char kTestName[] = "mojo:test-app";
class DefaultShellClient : public mojo::ShellClient {
public:
@@ -33,7 +32,7 @@ scoped_ptr<mojo::shell::TestApplicationCatalogStore>
BuildTestApplicationCatalogStore() {
scoped_ptr<base::ListValue> apps(new base::ListValue);
apps->Append(
- mojo::shell::BuildPermissiveSerializedAppInfo(GURL(kTestUrl), "test"));
+ mojo::shell::BuildPermissiveSerializedAppInfo(kTestName, "test"));
return make_scoped_ptr(
new mojo::shell::TestApplicationCatalogStore(std::move(apps)));
}
@@ -49,7 +48,7 @@ class PlatformTestHelperMus : public PlatformTestHelper {
shell_client_.reset(new DefaultShellClient);
shell_connection_.reset(new mojo::ShellConnection(
shell_client_.get(),
- background_shell_->CreateShellClientRequest(GURL(kTestUrl))));
+ background_shell_->CreateShellClientRequest(kTestName)));
shell_connection_->WaitForInitialize();
// ui/views/mus requires a WindowManager running, for now use the desktop
// one.
« no previous file with comments | « mojo/shell/tests/package_test_package_manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698