Desktop Capture Picker New UI: Preliminary Refactor

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

 // Copyright 2013 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.
 
 #include <queue>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 38 matching lines @@
     expectation_->picker_created = true;
   }
   ~FakeDesktopMediaPicker() override { expectation_->picker_deleted = true; }
 
   // DesktopMediaPicker interface.
   void Show(content::WebContents* web_contents,
             gfx::NativeWindow context,
             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) {
       // Post a task to call the callback asynchronously.
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(&FakeDesktopMediaPicker::CallCallback,
                      weak_factory_.GetWeakPtr(), done_callback));
     } else {
       // If we expect the dialog to be cancelled then store the callback to
@@ skipping 21 matching lines @@
   FakeDesktopMediaPickerFactory() {}
   ~FakeDesktopMediaPickerFactory() override {}
 
   void SetTestFlags(TestFlags* test_flags, int tests_count) {
     test_flags_ = test_flags;
     tests_count_ = tests_count;
     current_test_ = 0;
   }
 
   // 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 {
     EXPECT_LE(current_test_, tests_count_);
     if (current_test_ >= tests_count_)
       return std::unique_ptr<DesktopMediaPicker>();
     ++current_test_;
     return std::unique_ptr<DesktopMediaPicker>(
         new FakeDesktopMediaPicker(test_flags_ + current_test_ - 1));
   }
@@ skipping 149 matching lines @@
   EXPECT_TRUE(result);
   EXPECT_TRUE(test_flags[2].picker_created);
   EXPECT_FALSE(test_flags[2].picker_deleted);
 
   web_contents->Close();
   destroyed_watcher.Wait();
   EXPECT_TRUE(test_flags[2].picker_deleted);
 }
 
 }  // namespace extensions