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

Unified Diff: shell/application_manager/application_manager_unittest.cc

Issue 972433004: Use the mojo::shell namespace consistently underly shell/. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Java! Created 5 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 | « shell/application_manager/application_manager.cc ('k') | shell/application_manager/fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/application_manager/application_manager_unittest.cc
diff --git a/shell/application_manager/application_manager_unittest.cc b/shell/application_manager/application_manager_unittest.cc
index 3d8b8725880b84e1725a8cb28fa2e056e52d9625..1683ab8252d9f7b301193d2eb2732ae2e8498665 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 @@ class TestServiceImpl : public TestService {
// 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 @@ class TestBImpl : public TestB {
}
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 @@ class TestCImpl : public TestC {
~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 @@ class TestExternal : public ApplicationDelegate {
bool configure_incoming_connection_called_;
};
-} // namespace
-
class ApplicationManagerTest : public testing::Test {
public:
ApplicationManagerTest() : tester_context_(&loop_) {}
@@ -755,4 +754,6 @@ TEST_F(ApplicationManagerTest, TestQueryWithLoaders) {
EXPECT_EQ(1, scheme_loader->num_loads());
}
+} // namespace
+} // namespace shell
} // namespace mojo
« no previous file with comments | « shell/application_manager/application_manager.cc ('k') | shell/application_manager/fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698