OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include <string> | 5 #include <string> |
6 #include <utility> | 6 #include <utility> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 private: | 175 private: |
176 base::MessageLoop loop_; | 176 base::MessageLoop loop_; |
177 ChromiumPicklePasserImpl chromium_service_; | 177 ChromiumPicklePasserImpl chromium_service_; |
178 BindingSet<PicklePasser> chromium_bindings_; | 178 BindingSet<PicklePasser> chromium_bindings_; |
179 BlinkPicklePasserImpl blink_service_; | 179 BlinkPicklePasserImpl blink_service_; |
180 BindingSet<blink::PicklePasser> blink_bindings_; | 180 BindingSet<blink::PicklePasser> blink_bindings_; |
181 }; | 181 }; |
182 | 182 |
183 } // namespace | 183 } // namespace |
184 | 184 |
185 #if _MSC_FULL_VER == 191025017 | 185 #if _MSC_FULL_VER == 191025017 || _MSC_FULL_VER == 191125303 |
186 // Disabled due to this VS 2017 RTM code-gen bug: | 186 // Disabled due to this VS 2017 RTM code-gen bug, still present in Update 3 |
| 187 // Preview 1: |
187 // https://developercommunity.visualstudio.com/content/problem/40904/bad-code-ge
n-in-chromes-mojo-public-bindings-unitt.html | 188 // https://developercommunity.visualstudio.com/content/problem/40904/bad-code-ge
n-in-chromes-mojo-public-bindings-unitt.html |
188 #define MAYBE_ChromiumProxyToChromiumService \ | 189 #define MAYBE_ChromiumProxyToChromiumService \ |
189 DISABLED_ChromiumProxyToChromiumService | 190 DISABLED_ChromiumProxyToChromiumService |
190 #define MAYBE_ChromiumProxyToBlinkService DISABLED_ChromiumProxyToBlinkService | 191 #define MAYBE_ChromiumProxyToBlinkService DISABLED_ChromiumProxyToBlinkService |
191 #define MAYBE_BlinkProxyToBlinkService DISABLED_BlinkProxyToBlinkService | 192 #define MAYBE_BlinkProxyToBlinkService DISABLED_BlinkProxyToBlinkService |
192 #define MAYBE_BlinkProxyToChromiumService DISABLED_BlinkProxyToChromiumService | 193 #define MAYBE_BlinkProxyToChromiumService DISABLED_BlinkProxyToChromiumService |
193 #else | 194 #else |
194 #define MAYBE_ChromiumProxyToChromiumService ChromiumProxyToChromiumService | 195 #define MAYBE_ChromiumProxyToChromiumService ChromiumProxyToChromiumService |
195 #define MAYBE_ChromiumProxyToBlinkService ChromiumProxyToBlinkService | 196 #define MAYBE_ChromiumProxyToBlinkService ChromiumProxyToBlinkService |
196 #define MAYBE_BlinkProxyToBlinkService BlinkProxyToBlinkService | 197 #define MAYBE_BlinkProxyToBlinkService BlinkProxyToBlinkService |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 EXPECT_EQ(PickledEnumChromium::VALUE_1, | 408 EXPECT_EQ(PickledEnumChromium::VALUE_1, |
408 passed->f_enum); | 409 passed->f_enum); |
409 run_loop.Quit(); | 410 run_loop.Quit(); |
410 })); | 411 })); |
411 run_loop.Run(); | 412 run_loop.Run(); |
412 } | 413 } |
413 } | 414 } |
414 | 415 |
415 } // namespace test | 416 } // namespace test |
416 } // namespace mojo | 417 } // namespace mojo |
OLD | NEW |