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

Unified Diff: content/shell/renderer/test_runner/mock_web_user_media_client.h

Issue 308073011: test_runner: Migrate WebUserMediaClientMock to our Chromium C++ style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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: content/shell/renderer/test_runner/mock_web_user_media_client.h
diff --git a/content/shell/renderer/test_runner/WebUserMediaClientMock.h b/content/shell/renderer/test_runner/mock_web_user_media_client.h
similarity index 24%
rename from content/shell/renderer/test_runner/WebUserMediaClientMock.h
rename to content/shell/renderer/test_runner/mock_web_user_media_client.h
index d7237f51c60846a3b690537aa17b46e0ebf65ae5..d6981d055e37431dbca19ea65db5d15fdc45f8cc 100644
--- a/content/shell/renderer/test_runner/WebUserMediaClientMock.h
+++ b/content/shell/renderer/test_runner/mock_web_user_media_client.h
@@ -2,40 +2,40 @@
// 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_WEBUSERMEDIACLIENTMOCK_H_
-#define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBUSERMEDIACLIENTMOCK_H_
+#ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_
+#define CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_
-#include "base/basictypes.h"
-#include "content/shell/renderer/test_runner/TestCommon.h"
+#include "base/macros.h"
#include "content/shell/renderer/test_runner/WebTask.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebUserMediaClient.h"
namespace content {
class WebTestDelegate;
-class WebUserMediaClientMock : public blink::WebUserMediaClient {
-public:
- explicit WebUserMediaClientMock(WebTestDelegate*);
- virtual ~WebUserMediaClientMock() { }
+class MockWebUserMediaClient : public blink::WebUserMediaClient {
+ public:
+ explicit MockWebUserMediaClient(WebTestDelegate* delegate);
+ virtual ~MockWebUserMediaClient() {}
- virtual void requestUserMedia(const blink::WebUserMediaRequest&) OVERRIDE;
- virtual void cancelUserMediaRequest(const blink::WebUserMediaRequest&) OVERRIDE;
- virtual void requestMediaDevices(const blink::WebMediaDevicesRequest&) OVERRIDE;
- virtual void cancelMediaDevicesRequest(const blink::WebMediaDevicesRequest&) OVERRIDE;
+ virtual void requestUserMedia(const blink::WebUserMediaRequest&) OVERRIDE;
+ virtual void cancelUserMediaRequest(
+ const blink::WebUserMediaRequest&) OVERRIDE;
+ virtual void requestMediaDevices(
+ const blink::WebMediaDevicesRequest&) OVERRIDE;
+ virtual void cancelMediaDevicesRequest(
+ const blink::WebMediaDevicesRequest&) OVERRIDE;
- // Task related methods
- WebTaskList* mutable_task_list() { return &m_taskList; }
+ // Task related methods
+ WebTaskList* mutable_task_list() { return &task_list_; }
-private:
- WebTaskList m_taskList;
- WebTestDelegate* m_delegate;
+ private:
+ WebTaskList task_list_;
+ WebTestDelegate* delegate_;
- DISALLOW_COPY_AND_ASSIGN(WebUserMediaClientMock);
+ DISALLOW_COPY_AND_ASSIGN(MockWebUserMediaClient);
};
} // namespace content
-#endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBUSERMEDIACLIENTMOCK_H_
+#endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_MOCK_WEB_USER_MEDIA_CLIENT_H_

Powered by Google App Engine
This is Rietveld 408576698