Add Camera log type to device log

Bug: b/172344305
Test: Build successfully
Change-Id: Ibef322d2c968a844c778baa6d8ca9cd0a2909b71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2554262Reviewed-by: Shik Chen <shik@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Auto-Submit: Wei Lee <wtlee@chromium.org>
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831008}

chrome/app/generated_resources.grd

@@ -10020,6 +10020,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_DEVICE_LOG_TYPE_SERIAL" desc="Checkbox to enable showing events related to serial devices">
         Serial
       </message>
+      <message name="IDS_DEVICE_LOG_TYPE_CAMERA" desc="Checkbox to enable showing events of type Camera">
+        Camera
+      </message>
       <message name="IDS_DEVICE_LOG_FILEINFO" desc="File info checkbox in device event log">
         File Info
       </message>

chrome/app/generated_resources_grd/IDS_DEVICE_LOG_TYPE_CAMERA.png.sha1

+4ea28d176af17a37e870a8aca31cea3df106d488
\ No newline at end of file

chrome/browser/resources/device_log_ui/device_log_ui.html

@@ -73,6 +73,10 @@
       <input id="log-type-serial" type="checkbox">
       <span>$i18n{logTypeSerialText}</span>
     </label>
+    <label>
+      <input id="log-type-camera" type="checkbox">
+      <span>$i18n{logTypeCameraText}</span>
+    </label>
   </div>
   <div id="log-container"></div>
 </body>

chrome/browser/ui/webui/device_log_ui.cc

@@ -90,6 +90,7 @@ DeviceLogUI::DeviceLogUI(content::WebUI* web_ui)
       {"logTypePrinterText", IDS_DEVICE_LOG_TYPE_PRINTER},
       {"logTypeFidoText", IDS_DEVICE_LOG_TYPE_FIDO},
       {"logTypeSerialText", IDS_DEVICE_LOG_TYPE_SERIAL},
+      {"logTypeCameraText", IDS_DEVICE_LOG_TYPE_CAMERA},
       {"logEntryFormat", IDS_DEVICE_LOG_ENTRY},
   };
   AddLocalizedStringsBulk(html, kStrings);

components/device_event_log/device_event_log.h

@@ -71,6 +71,9 @@
 #define SERIAL_PLOG(level)                         \
   DEVICE_PLOG(::device_event_log::LOG_TYPE_SERIAL, \
               ::device_event_log::LOG_LEVEL_##level)
+#define CAMERA_LOG(level)                         \
+  DEVICE_LOG(::device_event_log::LOG_TYPE_CAMERA, \
+             ::device_event_log::LOG_LEVEL_##level)
 
 #if defined(OS_ANDROID) && defined(OFFICIAL_BUILD)
 // FIDO_LOG is discarded for release Android builds in order to reduce binary
@@ -129,8 +132,10 @@ enum LogType {
   LOG_TYPE_FIDO = 8,
   // Serial port related events (i.e. services/device/serial).
   LOG_TYPE_SERIAL = 9,
+  // Camera related events.
+  LOG_TYPE_CAMERA = 10,
   // Used internally, must be the last type (may be changed).
-  LOG_TYPE_UNKNOWN = 10
+  LOG_TYPE_UNKNOWN = 11
 };
 
 // Used to specify the detail level for logging. In GetAsString, used to

components/device_event_log/device_event_log_impl.cc

@@ -38,6 +38,7 @@ const char* kLogTypeMemoryDesc = "Memory";
 const char* kLogTypePrinterDesc = "Printer";
 const char* kLogTypeFidoDesc = "FIDO";
 const char* kLogTypeSerialDesc = "Serial";
+const char* kLogTypeCameraDesc = "Camera";
 
 enum class ShowTime {
   kNone,
@@ -67,6 +68,8 @@ std::string GetLogTypeString(LogType type) {
       return kLogTypeFidoDesc;
     case LOG_TYPE_SERIAL:
       return kLogTypeSerialDesc;
+    case LOG_TYPE_CAMERA:
+      return kLogTypeCameraDesc;
     case LOG_TYPE_UNKNOWN:
       break;
   }