Make ExecutionMode pretty-printer available for CHECK outside tests

R=proberge

Bug: 872748
Change-Id: I42ae9acf6bd189ef45543ddfa15521262c56b95f
Reviewed-on: https://chromium-review.googlesource.com/1171549Reviewed-by: proberge <proberge@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582343}

chrome/chrome_cleaner/logging/BUILD.gn

@@ -241,7 +241,6 @@ source_set("unittest_sources") {
     "//chrome/chrome_cleaner/test:test_util",
     "//chrome/chrome_cleaner/test/resources:test_resources",
     "//components/chrome_cleaner/public/constants:constants",
-    "//components/chrome_cleaner/public/constants:test_support",
     "//net/traffic_annotation:test_support",
     "//testing/gmock",
     "//testing/gtest",

chrome/chrome_cleaner/settings/BUILD.gn

@@ -75,7 +75,6 @@ source_set("unittest_sources") {
     "//chrome/chrome_cleaner/constants:common_strings",
     "//chrome/chrome_cleaner/test:test_util",
     "//components/chrome_cleaner/public/constants:constants",
-    "//components/chrome_cleaner/public/constants:test_support",
     "//testing/gtest",
   ]
 }

chrome/chrome_cleaner/test/BUILD.gn

@@ -85,7 +85,6 @@ source_set("test_util") {
     "//chrome/chrome_cleaner/settings:settings",
     "//chrome/chrome_cleaner/strings",
     "//components/chrome_cleaner/public/constants:constants",
-    "//components/chrome_cleaner/public/constants:test_support",
     "//sandbox/win:sandbox",
   ]
 

chrome/test/BUILD.gn

@@ -999,7 +999,6 @@ test("browser_tests") {
       "//components/autofill/content/common:mojo_interfaces",
       "//components/autofill/content/renderer:test_support",
       "//components/captive_portal:test_support",
-      "//components/chrome_cleaner/public/constants:test_support",
       "//components/dom_distiller/content/browser",
       "//components/dom_distiller/content/renderer",
       "//components/dom_distiller/core:test_support",
@@ -3230,7 +3229,6 @@ test("unit_tests") {
     deps += [
       "//chrome/browser/apps/foundation/app_service:unit_tests",
       "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
-      "//components/chrome_cleaner/public/constants:test_support",
       "//components/signin/core/browser:signin_buildflags",
       "//services/metrics/public/cpp:ukm_builders",
       "//third_party/libaddressinput",

components/chrome_cleaner/public/constants/BUILD.gn

@@ -9,15 +9,3 @@ source_set("constants") {
     "result_codes.h",
   ]
 }
-
-source_set("test_support") {
-  testonly = true
-
-  sources = [
-    "constants_test_support.cc",
-  ]
-
-  deps = [
-    ":constants",
-  ]
-}

components/chrome_cleaner/public/constants/constants.cc

@@ -45,4 +45,46 @@ const wchar_t kStartTimeValueName[] = L"StartTime";
 const wchar_t kUploadResultsValueName[] = L"UploadResults";
 const wchar_t kVersionValueName[] = L"Version";
 
+std::ostream& operator<<(std::ostream& stream, ExecutionMode mode) {
+  switch (mode) {
+    case ExecutionMode::kNone:
+      stream << "ExecutionModeNone";
+      break;
+    case ExecutionMode::kScanning:
+      stream << "ExecutionModeScanning";
+      break;
+    case ExecutionMode::kCleanup:
+      stream << "ExecutionModeCleanup";
+      break;
+    case ExecutionMode::kNumValues:
+      stream << "ExecutionModeNumValues";
+      break;
+  }
+  return stream;
+}
+
+std::ostream& operator<<(std::ostream& stream, ChromePromptValue value) {
+  switch (value) {
+    case ChromePromptValue::kUnspecified:
+      stream << "ChromePromptUnspecified";
+      break;
+    case ChromePromptValue::kPrompted:
+      stream << "ChromePromptPrompted";
+      break;
+    case ChromePromptValue::kUserInitiated:
+      stream << "ChromePromptUserInitiated";
+      break;
+    case ChromePromptValue::kLegacyNotPrompted:
+      stream << "ChromePromptLegacyNotPrompted";
+      break;
+    case ChromePromptValue::kLegacyUnknown:
+      stream << "ChromePromptLegacyUnknown";
+      break;
+    case ChromePromptValue::kLegacyShownFromMenu:
+      stream << "ChromePromptLegacyShownFromMenu";
+      break;
+  }
+  return stream;
+}
+
 }  // namespace chrome_cleaner

components/chrome_cleaner/public/constants/constants.h

@@ -151,10 +151,9 @@ enum class ExecutionMode {
   kNumValues,
 };
 
-// Pretty printers for gtest. Declared here to avoid ODR violations, but only
-// defined in constants_test_support.cc to prevent their use outside tests. (See
-// https://groups.google.com/a/chromium.org/d/msg/chromium-dev/i_wOTsE5Z6g/jhtqTY6fCwAJ
-// for explanation.)
+// Pretty printers for gtest and CHECK. Declared here to avoid ODR violations.
+// See explanation at
+// https://groups.google.com/a/chromium.org/d/msg/chromium-dev/i_wOTsE5Z6g/jhtqTY6fCwAJ.
 
 std::ostream& operator<<(std::ostream& stream, ChromePromptValue mode);
 

components/chrome_cleaner/public/constants/constants_test_support.cc

-// Copyright 2018 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 "components/chrome_cleaner/public/constants/constants.h"
-
-namespace chrome_cleaner {
-
-std::ostream& operator<<(std::ostream& stream, ExecutionMode mode) {
-  switch (mode) {
-    case ExecutionMode::kNone:
-      stream << "ExecutionModeNone";
-      break;
-    case ExecutionMode::kScanning:
-      stream << "ExecutionModeScanning";
-      break;
-    case ExecutionMode::kCleanup:
-      stream << "ExecutionModeCleanup";
-      break;
-    case ExecutionMode::kNumValues:
-      stream << "ExecutionModeNumValues";
-      break;
-  }
-  return stream;
-}
-
-std::ostream& operator<<(std::ostream& stream, ChromePromptValue value) {
-  switch (value) {
-    case ChromePromptValue::kUnspecified:
-      stream << "ChromePromptUnspecified";
-      break;
-    case ChromePromptValue::kPrompted:
-      stream << "ChromePromptPrompted";
-      break;
-    case ChromePromptValue::kUserInitiated:
-      stream << "ChromePromptUserInitiated";
-      break;
-    case ChromePromptValue::kLegacyNotPrompted:
-      stream << "ChromePromptLegacyNotPrompted";
-      break;
-    case ChromePromptValue::kLegacyUnknown:
-      stream << "ChromePromptLegacyUnknown";
-      break;
-    case ChromePromptValue::kLegacyShownFromMenu:
-      stream << "ChromePromptLegacyShownFromMenu";
-      break;
-  }
-  return stream;
-}
-
-}  // namespace chrome_cleaner