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

Unified Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

Issue 100303004: Use FakeDesktopMediaList for Desktop Capture API tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « chrome/browser/media/fake_desktop_media_list.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
index 3901f95adbe1a4f234691bd15a9ffe159d667681..17aa9a660449102eb885d5faf46044550afdb0cd 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
@@ -8,6 +8,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/run_loop.h"
#include "chrome/browser/media/desktop_media_list_observer.h"
+#include "chrome/browser/media/fake_desktop_media_list.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest_mac.h"
@@ -36,71 +37,6 @@
}
@end
-class FakeDesktopMediaList : public DesktopMediaList {
- public:
- FakeDesktopMediaList() : observer_(NULL) {
- }
-
- void AddSource(int id) {
- Source source;
- source.id =
- content::DesktopMediaID(content::DesktopMediaID::TYPE_WINDOW, id);
- source.name = base::Int64ToString16(id);
-
- sources_.push_back(source);
- observer_->OnSourceAdded(sources_.size() - 1);
- }
-
- void RemoveSource(int index) {
- sources_.erase(sources_.begin() + index);
- observer_->OnSourceRemoved(sources_.size() - 1);
- }
-
- void SetSourceThumbnail(int index) {
- sources_[index].thumbnail = thumbnail_;
- observer_->OnSourceThumbnailChanged(index);
- }
-
- void SetSourceName(int index, string16 name) {
- sources_[index].name = name;
- observer_->OnSourceNameChanged(index);
- }
-
- // DesktopMediaList implementation:
- virtual void SetUpdatePeriod(base::TimeDelta period) OVERRIDE {
- }
-
- virtual void SetThumbnailSize(const gfx::Size& thumbnail_size) OVERRIDE {
- }
-
- virtual void SetViewDialogWindowId(
- content::DesktopMediaID::Id dialog_id) OVERRIDE {
- }
-
- virtual void StartUpdating(DesktopMediaListObserver* observer) OVERRIDE {
- observer_ = observer;
-
- SkBitmap bitmap;
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, 150, 150);
- bitmap.allocPixels();
- bitmap.eraseRGB(0, 255, 0);
- thumbnail_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
- }
-
- virtual int GetSourceCount() const OVERRIDE {
- return sources_.size();
- }
-
- virtual const Source& GetSource(int index) const OVERRIDE {
- return sources_[index];
- }
-
- private:
- std::vector<Source> sources_;
- DesktopMediaListObserver* observer_;
- gfx::ImageSkia thumbnail_;
-};
-
class DesktopMediaPickerControllerTest : public CocoaTest {
public:
DesktopMediaPickerControllerTest()
« no previous file with comments | « chrome/browser/media/fake_desktop_media_list.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698