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

Side by Side Diff: mojo/shell/public/cpp/shell_test.h

Issue 1780973004: Kill ShellConnection::WaitForInitialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fuse-api
Patch Set: Created 4 years, 9 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
« no previous file with comments | « mojo/shell/public/cpp/shell_connection.h ('k') | mojo/shell/tests/shell/shell_unittest.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_PUBLIC_CPP_SHELL_TEST_H_ 5 #ifndef MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_
6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ 6 #define MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "mojo/public/cpp/system/macros.h" 9 #include "mojo/public/cpp/system/macros.h"
10 #include "mojo/shell/public/cpp/connector.h" 10 #include "mojo/shell/public/cpp/connector.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const std::string& test_userid() const { return initialize_userid_; } 65 const std::string& test_userid() const { return initialize_userid_; }
66 uint32_t test_instance_id() const { return initialize_instance_id_; } 66 uint32_t test_instance_id() const { return initialize_instance_id_; }
67 67
68 // By default, creates a simple ShellClient that captures the metadata sent 68 // By default, creates a simple ShellClient that captures the metadata sent
69 // via Initialize(). Override to customize, but custom implementations must 69 // via Initialize(). Override to customize, but custom implementations must
70 // call InitializeCalled() to forward the metadata so test_name() etc all 70 // call InitializeCalled() to forward the metadata so test_name() etc all
71 // work. 71 // work.
72 virtual scoped_ptr<ShellClient> CreateShellClient(); 72 virtual scoped_ptr<ShellClient> CreateShellClient();
73 73
74 // Call to set Initialize() metadata when GetShellClient() is overridden. 74 // Call to set Initialize() metadata when GetShellClient() is overridden.
75 void InitializeCalled(Connector* connector, 75 void InitializeCalled(const std::string& name,
76 const std::string& name,
77 const std::string& userid, 76 const std::string& userid,
78 uint32_t id); 77 uint32_t id);
79 78
80 // testing::Test: 79 // testing::Test:
81 void SetUp() override; 80 void SetUp() override;
82 void TearDown() override; 81 void TearDown() override;
83 82
84 private: 83 private:
85 friend ShellTestClient; 84 friend ShellTestClient;
86 85
(...skipping 11 matching lines...) Expand all
98 std::string initialize_userid_ = shell::mojom::kInheritUserID; 97 std::string initialize_userid_ = shell::mojom::kInheritUserID;
99 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID; 98 uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID;
100 99
101 DISALLOW_COPY_AND_ASSIGN(ShellTest); 100 DISALLOW_COPY_AND_ASSIGN(ShellTest);
102 }; 101 };
103 102
104 } // namespace test 103 } // namespace test
105 } // namespace mojo 104 } // namespace mojo
106 105
107 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_ 106 #endif // MOJO_SHELL_PUBLIC_CPP_SHELL_TEST_H_
OLDNEW
« no previous file with comments | « mojo/shell/public/cpp/shell_connection.h ('k') | mojo/shell/tests/shell/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698