OLD | NEW |
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 "mojo/shell/application_manager/application_manager.h" | 6 #include "mojo/shell/application_manager/application_manager.h" |
7 #include "mojo/shell/context.h" | 7 #include "mojo/shell/context.h" |
8 #include "mojo/shell/filename_util.h" | 8 #include "mojo/shell/filename_util.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 | 10 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 void TearDown() override { context_.Shutdown(); } | 71 void TearDown() override { context_.Shutdown(); } |
72 | 72 |
73 protected: | 73 protected: |
74 shell::Context context_; | 74 shell::Context context_; |
75 base::MessageLoop loop_; | 75 base::MessageLoop loop_; |
76 ApplicationManager application_manager_; | 76 ApplicationManager application_manager_; |
77 TestState state_; | 77 TestState state_; |
78 | 78 |
79 private: | 79 private: |
80 // ApplicationManager::Delegate | 80 // ApplicationManager::Delegate |
81 GURL ResolveURL(const GURL& url) override { return url; } | |
82 | |
83 GURL ResolveMappings(const GURL& url) override { return url; } | 81 GURL ResolveMappings(const GURL& url) override { return url; } |
| 82 GURL ResolveMojoURL(const GURL& url) override { return url; } |
84 }; | 83 }; |
85 | 84 |
86 TEST_F(NativeApplicationLoaderTest, DoesNotExist) { | 85 TEST_F(NativeApplicationLoaderTest, DoesNotExist) { |
87 base::ScopedTempDir temp_dir; | 86 base::ScopedTempDir temp_dir; |
88 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); | 87 ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); |
89 base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt")); | 88 base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt")); |
90 GURL url(FilePathToFileURL(temp_dir.path().Append(nonexistent_file))); | 89 GURL url(FilePathToFileURL(temp_dir.path().Append(nonexistent_file))); |
91 InterfaceRequest<ServiceProvider> services; | 90 InterfaceRequest<ServiceProvider> services; |
92 ServiceProviderPtr service_provider; | 91 ServiceProviderPtr service_provider; |
93 application_manager_.ConnectToApplication( | 92 application_manager_.ConnectToApplication( |
94 url, GURL(), services.Pass(), service_provider.Pass(), base::Closure()); | 93 url, GURL(), services.Pass(), service_provider.Pass(), base::Closure()); |
95 EXPECT_FALSE(state_.runner_was_created); | 94 EXPECT_FALSE(state_.runner_was_created); |
96 EXPECT_FALSE(state_.runner_was_started); | 95 EXPECT_FALSE(state_.runner_was_started); |
97 EXPECT_FALSE(state_.runner_was_destroyed); | 96 EXPECT_FALSE(state_.runner_was_destroyed); |
98 } | 97 } |
99 | 98 |
100 } // namespace | 99 } // namespace |
101 } // namespace shell | 100 } // namespace shell |
102 } // namespace mojo | 101 } // namespace mojo |
OLD | NEW |