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

Side by Side Diff: mojo/runner/shell_test_base.h

Issue 1342503003: Move fetching logic out of ApplicationManager, eliminate url mappings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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 #ifndef MOJO_RUNNER_SHELL_TEST_BASE_H_ 5 #ifndef MOJO_RUNNER_SHELL_TEST_BASE_H_
6 #define MOJO_RUNNER_SHELL_TEST_BASE_H_ 6 #define MOJO_RUNNER_SHELL_TEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 24 matching lines...) Expand all
35 const std::string& service_name); 35 const std::string& service_name);
36 36
37 template <typename Interface> 37 template <typename Interface>
38 void ConnectToService(const GURL& application_url, 38 void ConnectToService(const GURL& application_url,
39 InterfacePtr<Interface>* ptr) { 39 InterfacePtr<Interface>* ptr) {
40 ptr->Bind(InterfacePtrInfo<Interface>( 40 ptr->Bind(InterfacePtrInfo<Interface>(
41 ConnectToService(application_url, Interface::Name_).Pass(), 0u)); 41 ConnectToService(application_url, Interface::Name_).Pass(), 0u));
42 } 42 }
43 43
44 base::MessageLoop* message_loop() { return &message_loop_; } 44 base::MessageLoop* message_loop() { return &message_loop_; }
45 Context* shell_context() { return &shell_context_; } 45 Context* shell_context() { return shell_context_.get(); }
46 46
47 private: 47 private:
48 // Set up the test applications so that mojo: URL resolves to those. 48 scoped_ptr<Context> shell_context_;
49 void SetUpTestApplications();
50
51 Context shell_context_;
52 base::MessageLoop message_loop_; 49 base::MessageLoop message_loop_;
53 50
54 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); 51 DISALLOW_COPY_AND_ASSIGN(ShellTestBase);
55 }; 52 };
56 53
57 } // namespace test 54 } // namespace test
58 } // namespace runner 55 } // namespace runner
59 } // namespace mojo 56 } // namespace mojo
60 57
61 #endif // MOJO_RUNNER_SHELL_TEST_BASE_H_ 58 #endif // MOJO_RUNNER_SHELL_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698