mash: Have chrome set itself as a controller interface for changing volume

chrome/browser/ui/ash/volume_controller.h

Index: chrome/browser/ui/ash/volume_controller.h
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller.h
similarity index 55%
rename from chrome/browser/ui/ash/volume_controller_chromeos.h
rename to chrome/browser/ui/ash/volume_controller.h
index 532b3bafc0d73b90c5cf78706e3496dbde746f6d..a3ca76eccbc2bea341ec5bdae26b40ce33f90ea4 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.h
+++ b/chrome/browser/ui/ash/volume_controller.h
@@ -2,31 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
-#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
+#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_
+#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_
 
 #include "ash/public/interfaces/volume.mojom.h"
 #include "base/macros.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 // Controls the volume when F8-10 or a multimedia key for volume is pressed.
+// TODO(crbug.com/647781): Media accelerators like F8-F10 are broken in mash.
+// Fix this when mash supports event rewriting.
 class VolumeController : public ash::mojom::VolumeController {
  public:
   VolumeController();
   ~VolumeController() override;
 
-  // Binds the mojom::VolumeController interface request to this object.
-  void BindRequest(ash::mojom::VolumeControllerRequest request);
-
-  // Overridden from ash::mojom::VolumeController:
+  // Overridden from ash::mojom::VolumeClient:
   void VolumeMute() override;
   void VolumeDown() override;
   void VolumeUp() override;
 
  private:
-  mojo::BindingSet<ash::mojom::VolumeController> bindings_;
+  mojo::Binding<ash::mojom::VolumeController> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeController);
 };
 
-#endif  // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
+#endif  // CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_H_