Revert 116724 - Add gamepad data fetcher for Linux

content/browser/gamepad/gamepad_provider.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <cmath>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/browser/gamepad/gamepad_provider.h"
 #include "content/browser/gamepad/data_fetcher.h"
-#include "content/browser/gamepad/gamepad_provider.h"
-#include "content/browser/gamepad/platform_data_fetcher.h"
 #include "content/common/gamepad_messages.h"
-#include "content/public/browser/browser_thread.h"
+
+#if defined(OS_WIN)
+#include "content/browser/gamepad/data_fetcher_win.h"
+#elif defined(OS_MACOSX)
+#include "content/browser/gamepad/data_fetcher_mac.h"
+#endif
 
 namespace content {
 
+// Define the default data fetcher that GamepadProvider will use if none is
+// supplied. (GamepadPlatformDataFetcher).
+#if defined(OS_WIN)
+
+typedef GamepadDataFetcherWindows GamepadPlatformDataFetcher;
+
+#elif defined(OS_MACOSX)
+
+typedef GamepadDataFetcherMac GamepadPlatformDataFetcher;
+
+#else
+
+class GamepadEmptyDataFetcher : public GamepadDataFetcher {
+ public:
+  void GetGamepadData(WebKit::WebGamepads* pads, bool) {
+    pads->length = 0;
+  }
+};
+typedef GamepadEmptyDataFetcher GamepadPlatformDataFetcher;
+
+#endif
+
 GamepadProvider::GamepadProvider(GamepadDataFetcher* fetcher)
     : is_paused_(false),
       devices_changed_(true),
       provided_fetcher_(fetcher),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   size_t data_size = sizeof(GamepadHardwareBuffer);
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   if (monitor)
     monitor->AddDevicesChangedObserver(this);
   bool res = gamepad_shared_memory_.CreateAndMapAnonymous(data_size);
   DCHECK(res);
   GamepadHardwareBuffer* hwbuf = SharedMemoryAsHardwareBuffer();
   memset(hwbuf, 0, sizeof(GamepadHardwareBuffer));
 
   polling_thread_.reset(new base::Thread("Gamepad polling thread"));
-  polling_thread_->StartWithOptions(
-      base::Thread::Options(MessageLoop::TYPE_IO, 0));
+  polling_thread_->Start();
 
   MessageLoop* polling_loop = polling_thread_->message_loop();
   polling_loop->PostTask(
       FROM_HERE,
       base::Bind(&GamepadProvider::DoInitializePollingThread, this));
 }
 
 GamepadProvider::~GamepadProvider() {
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   if (monitor)
@@ skipping 94 matching lines @@
       kDesiredSamplingIntervalMs);
 }
 
 GamepadHardwareBuffer* GamepadProvider::SharedMemoryAsHardwareBuffer() {
   void* mem = gamepad_shared_memory_.memory();
   DCHECK(mem);
   return static_cast<GamepadHardwareBuffer*>(mem);
 }
 
 }  // namespace content