Add command-line flag for tests to bypass the screenshare window picker.

chrome/browser/ui/views/desktop_media_picker_views.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 "chrome/browser/ui/views/desktop_media_picker_views.h"
 
 #include "base/callback.h"
+#include "base/command_line.h"
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
+#include "chrome/common/chrome_switches.h"
 #include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/bubble/bubble_frame_view.h"
@@ skipping 30 matching lines @@
   return reinterpret_cast<DesktopMediaID::Id>(accelerated_widget);
 #else
   return static_cast<DesktopMediaID::Id>(accelerated_widget);
 #endif
 }
 
 int GetMediaListViewHeightForRows(size_t rows) {
   return kListItemHeight * rows;
 }
 
+static bool ShouldAutoSelectSource(const DesktopMediaList::Source& source) {

[Peter Kasting, 2014/08/13 17:17:50]

Nit: "static" unnecessary (you're already in an anonymous namespace)

Especially with the shortening suggestion below I'd probably just inline this
into the lone caller, but up to you.

[phoglund_chromium, 2014/08/14 13:16:24]

Done. Inlining worked out pretty nicely with your shorter version.

+  std::string desired_source =
+      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kAutoSelectDesktopCaptureSource);
+  if (desired_source.empty())
+    return false;
+
+  return desired_source == base::UTF16ToASCII(source.name);

[Peter Kasting, 2014/08/13 17:17:50]

Nit: Shorter:

  return !desired_source.empty() &&
      (base::ASCIIToUTF16(desired_source) == source.name);

(I chose to upconvert to UTF-16 instead of downconverting to ASCII in order to
avoid implying anything about whether source.name is actually ASCII.)

[phoglund_chromium, 2014/08/14 13:16:24]

Done.

+}
+
+class AutoSelectTask: public base::RefCounted<AutoSelectTask> {

[Peter Kasting, 2014/08/13 17:17:50]

Does this really need to be refcounted?  Seems like the posted task could just
own this object.

Nit: Space before single colon

[phoglund_chromium, 2014/08/14 13:16:24]

Nope, went with jiayl's solution instead.

+ public:
+  explicit AutoSelectTask(const base::WeakPtr<DesktopMediaListView>& list_view)
+      : list_view_(list_view) {}
+
+  void AcceptSelectedSource() {
+    if (list_view_) {
+      list_view_->OnSelectionChanged();
+      list_view_->OnDoubleClick();
+    }
+  }
+
+ private:
+  friend class base::RefCounted<AutoSelectTask>;
+  ~AutoSelectTask() {}
+
+  base::WeakPtr<DesktopMediaListView> list_view_;
+};

[Peter Kasting, 2014/08/13 17:17:50]

Nit: DISALLOW_COPY_AND_ASSIGN

[phoglund_chromium, 2014/08/14 13:16:24]

Acknowledged.

+
 }  // namespace
 
 DesktopMediaSourceView::DesktopMediaSourceView(
     DesktopMediaListView* parent,
     DesktopMediaID source_id)
     : parent_(parent),
       source_id_(source_id),
       image_view_(new views::ImageView()),
       label_(new views::Label()),
       selected_(false)  {
@@ skipping 120 matching lines @@
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     RequestFocus();
     event->SetHandled();
   }
 }
 
 DesktopMediaListView::DesktopMediaListView(
     DesktopMediaPickerDialogView* parent,
     scoped_ptr<DesktopMediaList> media_list)
     : parent_(parent),
-      media_list_(media_list.Pass()) {
+      media_list_(media_list.Pass()),
+      weak_factory_(this) {
   media_list_->SetThumbnailSize(gfx::Size(kThumbnailWidth, kThumbnailHeight));
 }
 
 DesktopMediaListView::~DesktopMediaListView() {}
 
 void DesktopMediaListView::StartUpdating(DesktopMediaID::Id dialog_window_id) {
   media_list_->SetViewDialogWindowId(dialog_window_id);
   media_list_->StartUpdating(this);
 }
 
@@ skipping 94 matching lines @@
   DesktopMediaSourceView* source_view =
       new DesktopMediaSourceView(this, source.id);
   source_view->SetName(source.name);
   source_view->SetGroup(kDesktopMediaSourceViewGroupId);
   AddChildViewAt(source_view, index);
 
   PreferredSizeChanged();
 
   if (child_count() % kListColumns == 1)
     parent_->OnMediaListRowsChanged();
+
+  if (ShouldAutoSelectSource(source)) {
+    // Focusing on the element will select it.
+    source_view->OnFocus();
+
+    // Accept and close the dialog when we're done adding sources.
+    scoped_refptr<AutoSelectTask> task(
+        new AutoSelectTask(weak_factory_.GetWeakPtr()));
+    content::BrowserThread::PostTask(
+        content::BrowserThread::UI, FROM_HERE,
+        base::Bind(&AutoSelectTask::AcceptSelectedSource, task));

[jiayl, 2014/08/13 17:32:42]

AutoSelectTask is not needed.
You can just do

PostTask(UI, FROM_HERE,    
    base::Bind(&DesktopMediaListView::AcceptSelection,     
               weak_factory_.GetWeakPtr());
 
DesktopMediaListView::AcceptSelection() {
  OnSelectionChanged();
  OnDoubleClick();
}

[phoglund_chromium, 2014/08/14 13:16:24]

So PostTask is smart enough to check the weak pointer? Nice.

+  }
 }
 
 void DesktopMediaListView::OnSourceRemoved(int index) {
   DesktopMediaSourceView* view =
       static_cast<DesktopMediaSourceView*>(child_at(index));
   DCHECK(view);
   DCHECK_EQ(view->GetClassName(), kDesktopMediaSourceViewClassName);
   bool was_selected = view->is_selected();
   RemoveChildView(view);
   delete view;
@@ skipping 244 matching lines @@
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(callback_, source));
   callback_.Reset();
 }
 
 // static
 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
   return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerViews());
 }