Retry to add MockPresentationClient to use in layout tests.

content/shell/renderer/test_runner/mock_presentation_service.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_PRESENTATION_SERVICE_H_
+#define CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_PRESENTATION_SERVICE_H_
+
+#include "base/macros.h"
+#include "base/observer_list.h"
+#include "content/shell/renderer/test_runner/mock_presentation_client.h"
+
+namespace content {
+
+// A mock implementation of the Mojo PresentationService to be used in tests
+// with content shell. Keeps track of all MockPresentationClient instances and
+// updates each instance with the new state if needed. The service is owned by
+// the WebTextProxy instance (so only one exists per RenderView). Each
+// MockPresentationClient is owned by WebFrameTextProxy (so one exists per each

[Peter Beverloo, 2015/02/12 17:39:20]

You're repeating lifetime constraints of both MockPresentationService and
MockPresentationClient in both class-level comments. Perhaps it's better to
focus on the own class, and just mention that "MockPresentationService will
inform all registered MockPresentationClients of status updates"?

[whywhat, 2015/02/12 18:40:14]

Done.
MockPresentationClient doesn't say anything about MockPresentationService.

+// RenderFrame, same as the real PresentationDispatcher) and is registered with
+// the MockPresentationService by the WebFrameTestProxy upon creation.
+class MockPresentationService {
+ public:
+  MockPresentationService();
+  virtual ~MockPresentationService();

[Peter Beverloo, 2015/02/12 17:39:20]

I don't think this has to be virtual.

[whywhat, 2015/02/12 18:40:14]

Done.

+
+  // Imitates getting the actual screen availability for the platform.
+  // If the state changed from the last call, notifies the registered clients.
+  void SetScreenAvailability(bool available);
+
+  // Resets the service state to the defaults for the next test.
+  void Reset();
+
+  // ObserverList implementation.
+  void RegisterPresentationClientMock(MockPresentationClient* client);
+  void UnregisterPresentationClientMock(MockPresentationClient* client);
+
+ private:
+  // The last known state of the screen availability, defaults to false.
+  bool screen_availability_;
+  // The registered presentation client mocks.
+  ObserverList<MockPresentationClient> presentation_clients_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockPresentationService);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_PRESENTATION_SERVICE_H_