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

Side by Side Diff: shell/dynamic_application_loader_unittest.cc

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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 "base/files/scoped_temp_dir.h" 5 #include "base/files/scoped_temp_dir.h"
6 #include "shell/context.h" 6 #include "shell/context.h"
7 #include "shell/dynamic_application_loader.h" 7 #include "shell/dynamic_application_loader.h"
8 #include "shell/dynamic_service_runner.h" 8 #include "shell/dynamic_service_runner.h"
9 #include "shell/filename_util.h" 9 #include "shell/filename_util.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 17 matching lines...) Expand all
28 class TestDynamicServiceRunner : public DynamicServiceRunner { 28 class TestDynamicServiceRunner : public DynamicServiceRunner {
29 public: 29 public:
30 explicit TestDynamicServiceRunner(TestState* state) : state_(state) { 30 explicit TestDynamicServiceRunner(TestState* state) : state_(state) {
31 state_->runner_was_created = true; 31 state_->runner_was_created = true;
32 } 32 }
33 ~TestDynamicServiceRunner() override { 33 ~TestDynamicServiceRunner() override {
34 state_->runner_was_destroyed = true; 34 state_->runner_was_destroyed = true;
35 base::MessageLoop::current()->Quit(); 35 base::MessageLoop::current()->Quit();
36 } 36 }
37 void Start(const base::FilePath& app_path, 37 void Start(const base::FilePath& app_path,
38 ScopedMessagePipeHandle service_handle, 38 InterfaceRequest<Application> application_request,
39 const base::Closure& app_completed_callback) override { 39 const base::Closure& app_completed_callback) override {
40 state_->runner_was_started = true; 40 state_->runner_was_started = true;
41 } 41 }
42 42
43 private: 43 private:
44 TestState* state_; 44 TestState* state_;
45 }; 45 };
46 46
47 class TestDynamicServiceRunnerFactory : public DynamicServiceRunnerFactory { 47 class TestDynamicServiceRunnerFactory : public DynamicServiceRunnerFactory {
48 public: 48 public:
(...skipping 26 matching lines...) Expand all
75 base::MessageLoop loop_; 75 base::MessageLoop loop_;
76 scoped_ptr<DynamicApplicationLoader> loader_; 76 scoped_ptr<DynamicApplicationLoader> loader_;
77 TestState state_; 77 TestState state_;
78 }; 78 };
79 79
80 TEST_F(DynamicApplicationLoaderTest, DoesNotExist) { 80 TEST_F(DynamicApplicationLoaderTest, DoesNotExist) {
81 base::ScopedTempDir temp_dir; 81 base::ScopedTempDir temp_dir;
82 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); 82 ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
83 base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt")); 83 base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt"));
84 GURL url(FilePathToFileURL(temp_dir.path().Append(nonexistent_file))); 84 GURL url(FilePathToFileURL(temp_dir.path().Append(nonexistent_file)));
85 ShellPtr shell; 85 ApplicationPtr application;
86 auto throwaway = GetProxy(&shell); 86 loader_->Load(context_.application_manager(), url, GetProxy(&application),
87 loader_->Load(context_.application_manager(), url, shell.Pass(),
88 ApplicationLoader::SimpleLoadCallback()); 87 ApplicationLoader::SimpleLoadCallback());
89 EXPECT_FALSE(state_.runner_was_created); 88 EXPECT_FALSE(state_.runner_was_created);
90 EXPECT_FALSE(state_.runner_was_started); 89 EXPECT_FALSE(state_.runner_was_started);
91 EXPECT_FALSE(state_.runner_was_destroyed); 90 EXPECT_FALSE(state_.runner_was_destroyed);
92 } 91 }
93 92
94 } // namespace shell 93 } // namespace shell
95 } // namespace mojo 94 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698