Move permission.mojom from WebKit/public/platform/ to components/

content/renderer/media/media_permission_dispatcher.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 "content/renderer/media/media_permission_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/base/bind_to_current_loop.h"
 #include "url/gurl.h"
 
 namespace {
 
 using Type = media::MediaPermission::Type;
 
-blink::mojom::PermissionName MediaPermissionTypeToPermissionName(Type type) {
+permissions::mojom::PermissionName MediaPermissionTypeToPermissionName(
+    Type type) {
   switch (type) {
     case Type::PROTECTED_MEDIA_IDENTIFIER:
-      return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+      return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
     case Type::AUDIO_CAPTURE:
-      return blink::mojom::PermissionName::AUDIO_CAPTURE;
+      return permissions::mojom::PermissionName::AUDIO_CAPTURE;
     case Type::VIDEO_CAPTURE:
-      return blink::mojom::PermissionName::VIDEO_CAPTURE;
+      return permissions::mojom::PermissionName::VIDEO_CAPTURE;
   }
   NOTREACHED();
-  return blink::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
+  return permissions::mojom::PermissionName::PROTECTED_MEDIA_IDENTIFIER;
 }
 
 }  // namespace
 
 namespace content {
 
 MediaPermissionDispatcher::MediaPermissionDispatcher(
     const ConnectToServiceCB& connect_to_service_cb)
     : connect_to_service_cb_(connect_to_service_cb),
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ skipping 69 matching lines @@
 
   uint32_t request_id = next_request_id_++;
   DCHECK(!requests_.count(request_id));
   requests_[request_id] = permission_status_cb;
 
   return request_id;
 }
 
 void MediaPermissionDispatcher::OnPermissionStatus(
     uint32_t request_id,
-    blink::mojom::PermissionStatus status) {
+    permissions::mojom::PermissionStatus status) {
   DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   RequestMap::iterator iter = requests_.find(request_id);
   DCHECK(iter != requests_.end()) << "Request not found.";
 
   PermissionStatusCB permission_status_cb = iter->second;
   requests_.erase(iter);
 
-  permission_status_cb.Run(status == blink::mojom::PermissionStatus::GRANTED);
+  permission_status_cb.Run(status ==
+                           permissions::mojom::PermissionStatus::GRANTED);

[dcheng, 2016/05/02 18:28:53]

Huh, is this clang-format? I'm surprised it didn't wrap this to the next line.

[xhwang, 2016/05/02 18:35:31]

Apparently yes :( I've stopped manual formatting for long time...

[dcheng, 2016/05/02 21:30:46]

I've filed a bug upstream: https://llvm.org/bugs/show_bug.cgi?id=27608

But this is fine (I am a strong advocate of not fighting clang-format): it's
mostly just surprising =)

 }
 
 }  // namespace content