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: shell/android/background_application_loader_unittest.cc

Issue 788243007: Moves BackgroundShellApplicationLoader to shell/android (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: merge 2 trunk Created 6 years 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/android/background_application_loader.cc ('k') | shell/android/mojo_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/android/background_application_loader_unittest.cc
diff --git a/mojo/application_manager/background_shell_application_loader_unittest.cc b/shell/android/background_application_loader_unittest.cc
similarity index 75%
rename from mojo/application_manager/background_shell_application_loader_unittest.cc
rename to shell/android/background_application_loader_unittest.cc
index b783a720687f164a50dc5911f4e485caf2645a2e..09bc2c8c46e737f5f036a392233ce5c98ecb3129 100644
--- a/mojo/application_manager/background_shell_application_loader_unittest.cc
+++ b/shell/android/background_application_loader_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/application_manager/background_shell_application_loader.h"
+#include "shell/android/background_application_loader.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,18 +36,18 @@ class DummyLoader : public ApplicationLoader {
} // namespace
// Tests that the loader can start and stop gracefully.
-TEST(BackgroundShellApplicationLoaderTest, StartStop) {
+TEST(BackgroundApplicationLoaderTest, StartStop) {
scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
- BackgroundShellApplicationLoader loader(
- real_loader.Pass(), "test", base::MessageLoop::TYPE_DEFAULT);
+ BackgroundApplicationLoader loader(real_loader.Pass(), "test",
+ base::MessageLoop::TYPE_DEFAULT);
}
// Tests that the loader can load a service that is well behaved (quits
// itself).
-TEST(BackgroundShellApplicationLoaderTest, Load) {
+TEST(BackgroundApplicationLoaderTest, Load) {
scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
- BackgroundShellApplicationLoader loader(
- real_loader.Pass(), "test", base::MessageLoop::TYPE_DEFAULT);
+ BackgroundApplicationLoader loader(real_loader.Pass(), "test",
+ base::MessageLoop::TYPE_DEFAULT);
MessagePipe dummy;
loader.Load(NULL, GURL(), dummy.handle0.Pass(),
ApplicationLoader::SimpleLoadCallback());
« no previous file with comments | « shell/android/background_application_loader.cc ('k') | shell/android/mojo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698