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

Unified Diff: shell/android/background_application_loader_unittest.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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: shell/android/background_application_loader_unittest.cc
diff --git a/shell/android/background_application_loader_unittest.cc b/shell/android/background_application_loader_unittest.cc
index e07d79d13cca10a47ad0b11e0614c28a323d7d43..17291b470bbfb73ad374c4293e36b76db95db5f6 100644
--- a/shell/android/background_application_loader_unittest.cc
+++ b/shell/android/background_application_loader_unittest.cc
@@ -7,7 +7,6 @@
#include "mojo/public/interfaces/application/application.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace mojo {
namespace shell {
namespace {
@@ -17,8 +16,9 @@ class DummyLoader : public ApplicationLoader {
~DummyLoader() override {}
// ApplicationLoader overrides:
- void Load(const GURL& url,
- InterfaceRequest<Application> application_request) override {
+ void Load(
+ const GURL& url,
+ mojo::InterfaceRequest<mojo::Application> application_request) override {
if (simulate_app_quit_)
base::MessageLoop::current()->Quit();
}
@@ -42,10 +42,9 @@ TEST(BackgroundApplicationLoaderTest, Load) {
scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
BackgroundApplicationLoader loader(real_loader.Pass(), "test",
base::MessageLoop::TYPE_DEFAULT);
- ApplicationPtr application;
- loader.Load(GURL(), GetProxy(&application));
+ mojo::ApplicationPtr application;
+ loader.Load(GURL(), mojo::GetProxy(&application));
}
} // namespace
} // namespace shell
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698