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

Side by Side Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)
Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" 5 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/media/desktop_media_list_observer.h" 10 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
11 #include "chrome/browser/media/fake_desktop_media_list.h" 11 #include "chrome/browser/media/webrtc/fake_desktop_media_list.h"
12 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 12 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
13 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h" 13 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"
14 #include "content/public/test/test_browser_thread_bundle.h" 14 #include "content/public/test/test_browser_thread_bundle.h"
15 #include "testing/gtest_mac.h" 15 #include "testing/gtest_mac.h"
16 16
17 using content::DesktopMediaID; 17 using content::DesktopMediaID;
18 18
19 @interface DesktopMediaPickerController (ExposedForTesting) 19 @interface DesktopMediaPickerController (ExposedForTesting)
20 - (IKImageBrowserView*)screenBrowser; 20 - (IKImageBrowserView*)screenBrowser;
21 - (IKImageBrowserView*)windowBrowser; 21 - (IKImageBrowserView*)windowBrowser;
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 screen_list_->SetSourceThumbnail(0); 417 screen_list_->SetSourceThumbnail(0);
418 EXPECT_EQ(1U, [items count]); 418 EXPECT_EQ(1U, [items count]);
419 EXPECT_EQ(nil, [[items objectAtIndex:0] imageTitle]); 419 EXPECT_EQ(nil, [[items objectAtIndex:0] imageTitle]);
420 420
421 AddScreen(1); 421 AddScreen(1);
422 screen_list_->SetSourceThumbnail(1); 422 screen_list_->SetSourceThumbnail(1);
423 EXPECT_EQ(2U, [items count]); 423 EXPECT_EQ(2U, [items count]);
424 EXPECT_NE(nil, [[items objectAtIndex:0] imageTitle]); 424 EXPECT_NE(nil, [[items objectAtIndex:0] imageTitle]);
425 EXPECT_NE(nil, [[items objectAtIndex:1] imageTitle]); 425 EXPECT_NE(nil, [[items objectAtIndex:1] imageTitle]);
426 } 426 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698