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

Unified Diff: remoting/host/host_mock_objects.h

Issue 6250198: More out-of-lining of test code, along with a bunch of GMOCK objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really fix the gyp files this time Created 9 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/mock_objects.h b/remoting/host/host_mock_objects.h
similarity index 80%
rename from remoting/host/mock_objects.h
rename to remoting/host/host_mock_objects.h
index 1c705d478c9aca1ba5abbd22c82bef145318a06d..de1fe7243fbfbc0d0197d278208d169c5c1cbe0b 100644
--- a/remoting/host/mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 REMOTING_HOST_MOCK_OBJECTS_H_
-#define REMOTING_HOST_MOCK_OBJECTS_H_
+#ifndef REMOTING_HOST_HOST_MOCK_OBJECTS_H_
+#define REMOTING_HOST_HOST_MOCK_OBJECTS_H_
#include "remoting/host/capturer.h"
#include "remoting/host/chromoting_host_context.h"
@@ -13,7 +13,8 @@ namespace remoting {
class MockCapturer : public Capturer {
public:
- MockCapturer() : Capturer(NULL) {}
+ MockCapturer();
+ virtual ~MockCapturer();
MOCK_METHOD0(ScreenConfigurationChanged, void());
MOCK_METHOD1(InvalidateRects, void(const InvalidRects& inval_rects));
@@ -31,7 +32,8 @@ class MockCapturer : public Capturer {
class MockChromotingHostContext : public ChromotingHostContext {
public:
- MockChromotingHostContext() {}
+ MockChromotingHostContext();
+ virtual ~MockChromotingHostContext();
MOCK_METHOD0(Start, void());
MOCK_METHOD0(Stop, void());
@@ -46,4 +48,4 @@ class MockChromotingHostContext : public ChromotingHostContext {
} // namespace remoting
-#endif // REMOTING_HOST_MOCK_OBJECTS_H_
+#endif // REMOTING_HOST_HOST_MOCK_OBJECTS_H_

Powered by Google App Engine
This is Rietveld 408576698