Move geolocation and permission mojoms into components.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 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/browser/media/cdm/browser_cdm_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 607 matching lines @@
   RenderFrameHost* rfh =
       RenderFrameHost::FromID(render_process_id_, render_frame_id);
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   PermissionManager* permission_manager =
       web_contents->GetBrowserContext()->GetPermissionManager();
   if (!permission_manager) {
     permission_status_cb.Run(false);
     return;
   }
 
-  PermissionStatus permission_status = permission_manager->GetPermissionStatus(
-      PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,
-      web_contents->GetLastCommittedURL().GetOrigin());
+  permission::Status permission_status =
+      permission_manager->GetPermissionStatus(
+          PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,
+          web_contents->GetLastCommittedURL().GetOrigin());
 
-  bool allowed = (permission_status == PERMISSION_STATUS_GRANTED);
+  bool allowed = (permission_status == permission::STATUS_GRANTED);
   if (!task_runner_->RunsTasksOnCurrentThread()) {
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(permission_status_cb, allowed));
   } else {
     permission_status_cb.Run(allowed);
   }
 }
 
 void BrowserCdmManager::CreateSessionAndGenerateRequestIfPermitted(
     int render_frame_id,
@@ skipping 38 matching lines @@
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   cdm->LoadSession(session_type, session_id, promise.Pass());
 }
 
 }  // namespace content