Merge 261317 "Read and expose accelerometer values from cros-ec-..."

chrome/browser/ui/ash/ash_init.cc

Index: chrome/browser/ui/ash/ash_init.cc
===================================================================
--- chrome/browser/ui/ash/ash_init.cc	(revision 263397)
+++ chrome/browser/ui/ash/ash_init.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
+#include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ -16,6 +17,7 @@
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/screenshot_taker.h"
 #include "chrome/common/chrome_switches.h"
+#include "content/public/browser/browser_thread.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 
@@ -58,6 +60,11 @@
   ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
   shell->accelerator_controller()->SetScreenshotDelegate(
       scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass());
+  // TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
+  shell->accelerometer_controller()->Initialize(
+      content::BrowserThread::GetBlockingPool()->
+          GetTaskRunnerWithShutdownBehavior(
+              base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
 #if defined(OS_CHROMEOS)
   shell->accelerator_controller()->SetImeControlDelegate(
       scoped_ptr<ash::ImeControlDelegate>(new ImeController).Pass());