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

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

Issue 281353005: Mojo: nuke EnvironmentData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix gn Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « mojo/shell/desktop/mojo_main.cc ('k') | mojo/shell/shell_test_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_SHELL_SHELL_TEST_BASE_H_ 5 #ifndef MOJO_SHELL_SHELL_TEST_BASE_H_
6 #define MOJO_SHELL_SHELL_TEST_BASE_H_ 6 #define MOJO_SHELL_SHELL_TEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "mojo/public/cpp/environment/environment.h"
13 #include "mojo/public/cpp/system/core.h" 12 #include "mojo/public/cpp/system/core.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
15 14
16 class GURL; 15 class GURL;
17 16
18 namespace base { 17 namespace base {
19 class MessageLoop; 18 class MessageLoop;
20 } 19 }
21 20
22 namespace mojo { 21 namespace mojo {
(...skipping 14 matching lines...) Expand all
37 // Launches the given service in-process; |service_url| should typically be a 36 // Launches the given service in-process; |service_url| should typically be a
38 // mojo: URL (the origin will be set to an "appropriate" file: URL). 37 // mojo: URL (the origin will be set to an "appropriate" file: URL).
39 void LaunchServiceInProcess(const GURL& service_url, 38 void LaunchServiceInProcess(const GURL& service_url,
40 const std::string& service_name, 39 const std::string& service_name,
41 ScopedMessagePipeHandle client_handle); 40 ScopedMessagePipeHandle client_handle);
42 41
43 base::MessageLoop* message_loop() { return message_loop_.get(); } 42 base::MessageLoop* message_loop() { return message_loop_.get(); }
44 Context* shell_context() { return shell_context_.get(); } 43 Context* shell_context() { return shell_context_.get(); }
45 44
46 private: 45 private:
47 Environment environment_;
48
49 // Only set if/when |InitMojo()| is called. 46 // Only set if/when |InitMojo()| is called.
50 scoped_ptr<base::MessageLoop> message_loop_; 47 scoped_ptr<base::MessageLoop> message_loop_;
51 scoped_ptr<Context> shell_context_; 48 scoped_ptr<Context> shell_context_;
52 49
53 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); 50 DISALLOW_COPY_AND_ASSIGN(ShellTestBase);
54 }; 51 };
55 52
56 } // namespace test 53 } // namespace test
57 54
58 } // namespace shell 55 } // namespace shell
59 } // namespace mojo 56 } // namespace mojo
60 57
61 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_ 58 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_
OLDNEW
« no previous file with comments | « mojo/shell/desktop/mojo_main.cc ('k') | mojo/shell/shell_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698