Change mojo enums to be scoped enums in the generated C++ bindings.

chrome/browser/permissions/permission_manager.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 "chrome/browser/permissions/permission_manager.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "build/build_config.h"
@@ skipping 16 matching lines @@
 using content::PermissionStatus;
 using content::PermissionType;
 
 namespace {
 
 // Helper method to convert ContentSetting to PermissionStatus.
 PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) {
   switch (setting) {
     case CONTENT_SETTING_ALLOW:
     case CONTENT_SETTING_SESSION_ONLY:
-      return content::PERMISSION_STATUS_GRANTED;
+      return content::PermissionStatus::GRANTED;
     case CONTENT_SETTING_BLOCK:
-      return content::PERMISSION_STATUS_DENIED;
+      return content::PermissionStatus::DENIED;
     case CONTENT_SETTING_ASK:
-      return content::PERMISSION_STATUS_ASK;
+      return content::PermissionStatus::ASK;
     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
     case CONTENT_SETTING_DEFAULT:
     case CONTENT_SETTING_NUM_SETTINGS:
       break;
   }
 
   NOTREACHED();
-  return content::PERMISSION_STATUS_DENIED;
+  return content::PermissionStatus::DENIED;
 }
 
 // Wrap a callback taking a PermissionStatus to pass it as a callback taking a
 // ContentSetting.
 void ContentSettingToPermissionStatusCallbackWrapper(
     const base::Callback<void(PermissionStatus)>& callback,
     ContentSetting setting) {
   callback.Run(ContentSettingToPermissionStatus(setting));
 }
 
@@ skipping 73 matching lines @@
   return ContentSettingToPermissionStatus(
       GetContentSettingForConstantPermission(type));
 }
 
 }  // anonymous namespace
 
 class PermissionManager::PendingRequest {
  public:
   PendingRequest(content::RenderFrameHost* render_frame_host,
                  const std::vector<PermissionType> permissions,
-                 const base::Callback<void(
-                     const std::vector<PermissionStatus>&)>& callback)
-    : render_process_id_(render_frame_host->GetProcess()->GetID()),
-      render_frame_id_(render_frame_host->GetRoutingID()),
-      callback_(callback),
-      permissions_(permissions),
-      results_(permissions.size(), content::PERMISSION_STATUS_DENIED),
-      remaining_results_(permissions.size()) {
-  }
+                 const base::Callback<
+                     void(const std::vector<PermissionStatus>&)>& callback)
+      : render_process_id_(render_frame_host->GetProcess()->GetID()),
+        render_frame_id_(render_frame_host->GetRoutingID()),
+        callback_(callback),
+        permissions_(permissions),
+        results_(permissions.size(), content::PermissionStatus::DENIED),
+        remaining_results_(permissions.size()) {}
 
   void SetPermissionStatus(int permission_id, PermissionStatus status) {
     DCHECK(!IsComplete());
 
     results_[permission_id] = status;
     --remaining_results_;
   }
 
   bool IsComplete() const {
     return remaining_results_ == 0;
@@ skipping 159 matching lines @@
 
 PermissionStatus PermissionManager::GetPermissionStatus(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   if (IsConstantPermission(permission))
     return GetPermissionStatusForConstantPermission(permission);
 
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
-    return content::PERMISSION_STATUS_DENIED;
+    return content::PermissionStatus::DENIED;
 
   return ContentSettingToPermissionStatus(context->GetPermissionStatus(
       requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));
 }
 
 void PermissionManager::RegisterPermissionUsage(PermissionType permission,
                                                 const GURL& requesting_origin,
                                                 const GURL& embedding_origin) {
   // This is required because constant permissions don't have a
   // ContentSettingsType.
@@ skipping 82 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }