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

Side by Side Diff: shell/shell_test_base.h

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 SHELL_SHELL_TEST_BASE_H_ 5 #ifndef SHELL_SHELL_TEST_BASE_H_
6 #define SHELL_SHELL_TEST_BASE_H_ 6 #define 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/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "mojo/public/cpp/system/core.h" 12 #include "mojo/public/cpp/system/core.h"
13 #include "shell/context.h" 13 #include "shell/context.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 class GURL; 16 class GURL;
17 17
18 namespace mojo {
19 namespace shell { 18 namespace shell {
20 namespace test { 19 namespace test {
21 20
22 class ShellTestBase : public testing::Test { 21 class ShellTestBase : public testing::Test {
23 public: 22 public:
24 ShellTestBase(); 23 ShellTestBase();
25 ~ShellTestBase() override; 24 ~ShellTestBase() override;
26 25
27 void SetUp() override; 26 void SetUp() override;
28 void TearDown() override; 27 void TearDown() override;
29 28
30 // |application_url| should typically be a mojo: URL (the origin will be set 29 // |application_url| should typically be a mojo: URL (the origin will be set
31 // to an "appropriate" file: URL). 30 // to an "appropriate" file: URL).
32 // TODO(tim): Should the test base be a ServiceProvider? 31 // TODO(tim): Should the test base be a mojo::ServiceProvider?
33 ScopedMessagePipeHandle ConnectToService(const GURL& application_url, 32 mojo::ScopedMessagePipeHandle ConnectToService(
34 const std::string& service_name); 33 const GURL& application_url,
34 const std::string& service_name);
35 35
36 template <typename Interface> 36 template <typename Interface>
37 void ConnectToService(const GURL& application_url, 37 void ConnectToService(const GURL& application_url,
38 InterfacePtr<Interface>* ptr) { 38 mojo::InterfacePtr<Interface>* ptr) {
39 ptr->Bind(ConnectToService(application_url, Interface::Name_).Pass()); 39 ptr->Bind(ConnectToService(application_url, Interface::Name_).Pass());
40 } 40 }
41 41
42 base::MessageLoop* message_loop() { return &message_loop_; } 42 base::MessageLoop* message_loop() { return &message_loop_; }
43 Context* shell_context() { return &shell_context_; } 43 Context* shell_context() { return &shell_context_; }
44 44
45 private: 45 private:
46 // Set up the test applications so that mojo: URL resolves to those. 46 // Set up the test applications so that mojo: URL resolves to those.
47 void SetUpTestApplications(); 47 void SetUpTestApplications();
48 48
49 Context shell_context_; 49 Context shell_context_;
50 base::MessageLoop message_loop_; 50 base::MessageLoop message_loop_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); 52 DISALLOW_COPY_AND_ASSIGN(ShellTestBase);
53 }; 53 };
54 54
55 } // namespace test 55 } // namespace test
56 } // namespace shell 56 } // namespace shell
57 } // namespace mojo
58 57
59 #endif // SHELL_SHELL_TEST_BASE_H_ 58 #endif // SHELL_SHELL_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698