Revert of Show error message for desktop capture related APIs on Aura Android

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

 // Copyright 2015 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/extensions/api/desktop_capture/desktop_capture_base.h"
 
 #include <tuple>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 112 matching lines @@
           show_screens ? webrtc::ScreenCapturer::Create(options) : NULL);
       scoped_ptr<webrtc::WindowCapturer> window_capturer(
           show_windows ? webrtc::WindowCapturer::Create(options) : NULL);
 
       media_list.reset(new NativeDesktopMediaList(
           screen_capturer.Pass(), window_capturer.Pass()));
     }
 
     // DesktopMediaPicker is implemented only for Windows, OSX and
     // Aura Linux builds.
-    // TODO(bshe): Use ANDROID_JAVA_UI flag here after it landed.
-#if (defined(TOOLKIT_VIEWS) && !defined(OS_ANDROID)) || defined(OS_MACOSX)
-    // TODO(bshe): This is called if chrome.desktopCapture.chooseDesktopMedia
-    // or chrome.webrtcDesktopCapturePrivate.chooseDesktopMedia are called by
-    // extensions. Simply return error message on Android platform for now.
-    // Revisit this when necessary. See crbug.com/557424.
+#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
     picker_ = DesktopMediaPicker::Create();
 #else
     error_ = "Desktop Capture API is not yet implemented for this platform.";
     return false;
 #endif
   }
   DesktopMediaPicker::DoneCallback callback = base::Bind(
       &DesktopCaptureChooseDesktopMediaFunctionBase::OnPickerDialogResults,
       this);
 
@@ skipping 87 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions