p2p: Make P2PManager available from the SystemState singleton

BUG=chromium:260426
TEST=Unit tests pass
Change-Id: Iadaa531d631c8d7268f35d512ff33f8d53e1cc5e
Reviewed-on: https://chromium-review.googlesource.com/64828
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Commit-Queue: David Zeuthen <zeuthen@chromium.org>
Tested-by: David Zeuthen <zeuthen@chromium.org>
diff --git a/mock_system_state.cc b/mock_system_state.cc
index 0ee9e5e..13581f7 100644
--- a/mock_system_state.cc
+++ b/mock_system_state.cc
@@ -14,7 +14,9 @@
     clock_(&default_clock_),
     hardware_(&default_hardware_),
     prefs_(&mock_prefs_),
-    powerwash_safe_prefs_(&mock_powerwash_safe_prefs_) {
+    powerwash_safe_prefs_(&mock_powerwash_safe_prefs_),
+    p2p_manager_(&mock_p2p_manager_),
+    payload_state_(&mock_payload_state_) {
   request_params_ = &default_request_params_;
   mock_payload_state_.Initialize(this);
   mock_gpio_handler_ = new testing::NiceMock<MockGpioHandler>();