Desktop Capture Picker New UI: Preliminary Refactor

chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
index d2d78e2cc24cd24f0998e5d2ecc223ad2b679f68..1710782e3582eb369d2c71dba1d1f63341f15d43 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc
@@ -56,7 +56,9 @@ class FakeDesktopMediaPicker : public DesktopMediaPicker {
             gfx::NativeWindow parent,
             const base::string16& app_name,
             const base::string16& target_name,
-            std::unique_ptr<DesktopMediaList> model,
+            std::unique_ptr<DesktopMediaList> screen_list,
+            std::unique_ptr<DesktopMediaList> window_list,
+            std::unique_ptr<DesktopMediaList> tab_list,
             bool request_audio,
             const DoneCallback& done_callback) override {
     if (!expectation_->cancelled) {
@@ -98,18 +100,31 @@ class FakeDesktopMediaPickerFactory :
   }
 
   // DesktopCaptureChooseDesktopMediaFunction::PickerFactory interface.
-  std::unique_ptr<DesktopMediaList> CreateModel(bool show_screens,
-                                                bool show_windows,
-                                                bool show_tabs,
-                                                bool show_audio) override {
+  std::vector<std::unique_ptr<DesktopMediaList>> CreateModel(
+      bool show_screens,
+      bool show_windows,
+      bool show_tabs,
+      bool show_audio) override {
     EXPECT_LE(current_test_, tests_count_);
-    if (current_test_ >= tests_count_)
-      return std::unique_ptr<DesktopMediaList>();
+    std::vector<std::unique_ptr<DesktopMediaList>> media_lists;
+    if (current_test_ >= tests_count_) {

[msw, 2016/04/13 00:04:02]

nit: just return the empty vector, if this is just a test safeguard?

[qiangchen, 2016/04/14 17:08:40]

media_lists here must have three items in it, otherwise when the caller calls
media_lists[2], it will crash.

+      media_lists.push_back(nullptr);
+      media_lists.push_back(nullptr);
+      media_lists.push_back(nullptr);
+      return media_lists;
+    }
     EXPECT_EQ(test_flags_[current_test_].expect_screens, show_screens);
     EXPECT_EQ(test_flags_[current_test_].expect_windows, show_windows);
     EXPECT_EQ(test_flags_[current_test_].expect_tabs, show_tabs);
     EXPECT_EQ(test_flags_[current_test_].expect_audio, show_audio);
-    return std::unique_ptr<DesktopMediaList>(new FakeDesktopMediaList());
+
+    media_lists.push_back(std::unique_ptr<DesktopMediaList>(
+        show_screens ? new FakeDesktopMediaList() : nullptr));
+    media_lists.push_back(std::unique_ptr<DesktopMediaList>(
+        show_windows ? new FakeDesktopMediaList() : nullptr));
+    media_lists.push_back(std::unique_ptr<DesktopMediaList>(
+        show_tabs ? new FakeDesktopMediaList() : nullptr));
+    return media_lists;
   }
 
   std::unique_ptr<DesktopMediaPicker> CreatePicker() override {