| Index: remoting/jingle_glue/jingle_glue_mock_objects.h
|
| diff --git a/remoting/jingle_glue/mock_objects.h b/remoting/jingle_glue/jingle_glue_mock_objects.h
|
| similarity index 73%
|
| rename from remoting/jingle_glue/mock_objects.h
|
| rename to remoting/jingle_glue/jingle_glue_mock_objects.h
|
| index 08e3cea9103af51f798d7fd7d8b879d8146d535c..505e563a4eb52b4405992d10937af41d638d3249 100644
|
| --- a/remoting/jingle_glue/mock_objects.h
|
| +++ b/remoting/jingle_glue/jingle_glue_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_JINGLE_GLUE_MOCK_OBJECTS_H_
|
| -#define REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
|
| +#ifndef REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
|
| +#define REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
|
|
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "third_party/libjingle/source/talk/base/stream.h"
|
| @@ -12,7 +12,8 @@ namespace remoting {
|
|
|
| class MockStream : public talk_base::StreamInterface {
|
| public:
|
| - virtual ~MockStream() { }
|
| + MockStream();
|
| + virtual ~MockStream();
|
|
|
| MOCK_CONST_METHOD0(GetState, talk_base::StreamState());
|
|
|
| @@ -28,4 +29,4 @@ class MockStream : public talk_base::StreamInterface {
|
|
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_JINGLE_GLUE_MOCK_OBJECTS_H_
|
| +#endif // REMOTING_JINGLE_GLUE_JINGLE_GLUE_MOCK_OBJECTS_H_
|
|
|