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

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

Issue 619493002: Mojo: Convert OVERRIDE -> override in various subdirectories of mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_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"
(...skipping 12 matching lines...) Expand all
23 23
24 namespace mojo { 24 namespace mojo {
25 namespace shell { 25 namespace shell {
26 namespace test { 26 namespace test {
27 27
28 class ShellTestBase : public testing::Test { 28 class ShellTestBase : public testing::Test {
29 public: 29 public:
30 ShellTestBase(); 30 ShellTestBase();
31 virtual ~ShellTestBase(); 31 virtual ~ShellTestBase();
32 32
33 virtual void SetUp() OVERRIDE; 33 virtual void SetUp() override;
34 34
35 // |application_url| should typically be a mojo: URL (the origin will be set 35 // |application_url| should typically be a mojo: URL (the origin will be set
36 // to an "appropriate" file: URL). 36 // to an "appropriate" file: URL).
37 // TODO(tim): Should the test base be a ServiceProvider? 37 // TODO(tim): Should the test base be a ServiceProvider?
38 ScopedMessagePipeHandle ConnectToService( 38 ScopedMessagePipeHandle ConnectToService(
39 const GURL& application_url, 39 const GURL& application_url,
40 const std::string& service_name); 40 const std::string& service_name);
41 41
42 ScopedMessagePipeHandle ConnectToServiceViaNetwork( 42 ScopedMessagePipeHandle ConnectToServiceViaNetwork(
43 const GURL& application_url, 43 const GURL& application_url,
(...skipping 21 matching lines...) Expand all
65 base::MessageLoop message_loop_; 65 base::MessageLoop message_loop_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(ShellTestBase); 67 DISALLOW_COPY_AND_ASSIGN(ShellTestBase);
68 }; 68 };
69 69
70 } // namespace test 70 } // namespace test
71 } // namespace shell 71 } // namespace shell
72 } // namespace mojo 72 } // namespace mojo
73 73
74 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_ 74 #endif // MOJO_SHELL_SHELL_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698