| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/shell/url_resolver.h" | 5 #include "mojo/runner/url_resolver.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 | 9 |
| 10 namespace mojo { | 10 namespace mojo { |
| 11 namespace shell { | 11 namespace shell { |
| 12 namespace test { | 12 namespace test { |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 typedef testing::Test URLResolverTest; | 15 typedef testing::Test URLResolverTest; |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 URLResolver resolver; | 141 URLResolver resolver; |
| 142 resolver.SetMojoBaseURL(GURL("file:///base")); | 142 resolver.SetMojoBaseURL(GURL("file:///base")); |
| 143 GURL mapped_url = resolver.ResolveMojoURL(GURL("mojo:foo?a=b")); | 143 GURL mapped_url = resolver.ResolveMojoURL(GURL("mojo:foo?a=b")); |
| 144 EXPECT_EQ("file:///base/foo.mojo?a=b", mapped_url.spec()); | 144 EXPECT_EQ("file:///base/foo.mojo?a=b", mapped_url.spec()); |
| 145 } | 145 } |
| 146 | 146 |
| 147 } // namespace | 147 } // namespace |
| 148 } // namespace test | 148 } // namespace test |
| 149 } // namespace shell | 149 } // namespace shell |
| 150 } // namespace mojo | 150 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1091513005:
Separate mojo/shell into a runner and the application manager (shell) (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master