Use the mojo::shell namespace consistently under shell/.
(Esp. under shell/application_manager/.)
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/972433004
diff --git a/shell/application_manager/application_manager_unittest.cc b/shell/application_manager/application_manager_unittest.cc
index 3d8b872..1683ab8 100644
--- a/shell/application_manager/application_manager_unittest.cc
+++ b/shell/application_manager/application_manager_unittest.cc
@@ -19,6 +19,7 @@
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
+namespace shell {
namespace {
const char kTestURLString[] = "test:testService";
@@ -62,7 +63,7 @@
// TestService implementation:
void Test(const String& test_string,
- const mojo::Callback<void()>& callback) override {
+ const Callback<void()>& callback) override {
context_->last_test_string = test_string;
callback.Run();
}
@@ -284,12 +285,12 @@
}
private:
- void B(const mojo::Callback<void()>& callback) override {
+ void B(const Callback<void()>& callback) override {
test_context_->IncrementNumBCalls();
callback.Run();
}
- void CallC(const mojo::Callback<void()>& callback) override {
+ void CallC(const Callback<void()>& callback) override {
test_context_->IncrementNumBCalls();
c_->C(callback);
}
@@ -309,7 +310,7 @@
~TestCImpl() override { test_context_->IncrementNumCDeletes(); }
private:
- void C(const mojo::Callback<void()>& callback) override {
+ void C(const Callback<void()>& callback) override {
test_context_->IncrementNumCCalls();
callback.Run();
}
@@ -436,8 +437,6 @@
bool configure_incoming_connection_called_;
};
-} // namespace
-
class ApplicationManagerTest : public testing::Test {
public:
ApplicationManagerTest() : tester_context_(&loop_) {}
@@ -755,4 +754,6 @@
EXPECT_EQ(1, scheme_loader->num_loads());
}
+} // namespace
+} // namespace shell
} // namespace mojo
