Printing API: Rename proto conversion helper

Bug: 992889
Change-Id: I510d33e358a9c2dbacecf4f99adf6ad68a0435ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1816465
Commit-Queue: Nikita Podguzov <nikitapodguzov@google.com>
Reviewed-by: Sean Kau <skau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698856}

chrome/browser/chromeos/BUILD.gn

@@ -1927,8 +1927,8 @@ source_set("chromeos") {
     "printing/history/print_job_history_service_factory.h",
     "printing/history/print_job_history_service_impl.cc",
     "printing/history/print_job_history_service_impl.h",
-    "printing/history/print_job_info_conversions.cc",
-    "printing/history/print_job_info_conversions.h",
+    "printing/history/print_job_info_proto_conversions.cc",
+    "printing/history/print_job_info_proto_conversions.h",
     "printing/ppd_provider_factory.cc",
     "printing/ppd_provider_factory.h",
     "printing/ppd_resolution_state.cc",
@@ -2745,7 +2745,7 @@ source_set("unit_tests") {
     "printing/history/mock_print_job_history_service.h",
     "printing/history/print_job_database_impl_unittest.cc",
     "printing/history/print_job_history_service_impl_unittest.cc",
-    "printing/history/print_job_info_conversions_unittest.cc",
+    "printing/history/print_job_info_proto_conversions_unittest.cc",
     "printing/history/test_print_job_database.cc",
     "printing/history/test_print_job_database.h",
     "printing/history/test_print_job_history_service_observer.cc",

chrome/browser/chromeos/printing/cups_print_job_manager_impl.cc

@@ -25,7 +25,7 @@
 #include "chrome/browser/chromeos/printing/cups_printers_manager.h"
 #include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
 #include "chrome/browser/chromeos/printing/history/print_job_info.pb.h"
-#include "chrome/browser/chromeos/printing/history/print_job_info_conversions.h"
+#include "chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/chromeos/printing/history/print_job_history_service_impl.cc

@@ -9,7 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/chromeos/printing/cups_print_job.h"
-#include "chrome/browser/chromeos/printing/history/print_job_info_conversions.h"
+#include "chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.h"
 
 namespace chromeos {
 

chrome/browser/chromeos/printing/history/print_job_info_conversions.cc → chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.cc

@@ -2,84 +2,85 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/printing/history/print_job_info_conversions.h"
+#include "chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.h"
 
 namespace chromeos {
 
+namespace proto = printing::proto;
+
 namespace {
 
-printing::proto::PrintSettings_ColorMode ColorModelToProto(
-    ::printing::ColorModel color) {
+proto::PrintSettings_ColorMode ColorModelToProto(::printing::ColorModel color) {
   return ::printing::IsColorModelSelected(color)
-             ? printing::proto::PrintSettings_ColorMode_COLOR
-             : printing::proto::PrintSettings_ColorMode_BLACK_AND_WHITE;
+             ? proto::PrintSettings_ColorMode_COLOR
+             : proto::PrintSettings_ColorMode_BLACK_AND_WHITE;
 }
 
-printing::proto::PrintSettings_DuplexMode DuplexModeToProto(
+proto::PrintSettings_DuplexMode DuplexModeToProto(
     ::printing::DuplexMode duplex) {
   switch (duplex) {
     case ::printing::DuplexMode::SIMPLEX:
-      return printing::proto::PrintSettings_DuplexMode_ONE_SIDED;
+      return proto::PrintSettings_DuplexMode_ONE_SIDED;
     case ::printing::DuplexMode::LONG_EDGE:
-      return printing::proto::PrintSettings_DuplexMode_TWO_SIDED_LONG_EDGE;
+      return proto::PrintSettings_DuplexMode_TWO_SIDED_LONG_EDGE;
     case ::printing::DuplexMode::SHORT_EDGE:
-      return printing::proto::PrintSettings_DuplexMode_TWO_SIDED_SHORT_EDGE;
+      return proto::PrintSettings_DuplexMode_TWO_SIDED_SHORT_EDGE;
     default:
       NOTREACHED();
   }
-  return printing::proto::PrintSettings_DuplexMode_ONE_SIDED;
+  return proto::PrintSettings_DuplexMode_ONE_SIDED;
 }
 
-printing::proto::MediaSize RequestedMediaToProto(
+proto::MediaSize RequestedMediaToProto(
     const ::printing::PrintSettings::RequestedMedia& media) {
-  printing::proto::MediaSize media_size_proto;
+  proto::MediaSize media_size_proto;
   media_size_proto.set_width(media.size_microns.width());
   media_size_proto.set_height(media.size_microns.height());
   media_size_proto.set_vendor_id(media.vendor_id);
   return media_size_proto;
 }
 
-printing::proto::PrintJobInfo_PrintJobSource PrintJobSourceToProto(
+proto::PrintJobInfo_PrintJobSource PrintJobSourceToProto(
     ::printing::PrintJob::Source source) {
   switch (source) {
     case ::printing::PrintJob::Source::PRINT_PREVIEW:
-      return printing::proto::PrintJobInfo_PrintJobSource_PRINT_PREVIEW;
+      return proto::PrintJobInfo_PrintJobSource_PRINT_PREVIEW;
     case ::printing::PrintJob::Source::ARC:
-      return printing::proto::PrintJobInfo_PrintJobSource_ARC;
+      return proto::PrintJobInfo_PrintJobSource_ARC;
     default:
       NOTREACHED();
   }
-  return printing::proto::PrintJobInfo_PrintJobSource_PRINT_PREVIEW;
+  return proto::PrintJobInfo_PrintJobSource_PRINT_PREVIEW;
 }
 
-printing::proto::PrintJobInfo_PrintJobStatus PrintJobStateToProto(
+proto::PrintJobInfo_PrintJobStatus PrintJobStateToProto(
     CupsPrintJob::State state) {
   switch (state) {
     case CupsPrintJob::State::STATE_FAILED:
-      return printing::proto::PrintJobInfo_PrintJobStatus_FAILED;
+      return proto::PrintJobInfo_PrintJobStatus_FAILED;
     case CupsPrintJob::State::STATE_CANCELLED:
-      return printing::proto::PrintJobInfo_PrintJobStatus_CANCELED;
+      return proto::PrintJobInfo_PrintJobStatus_CANCELED;
     case CupsPrintJob::State::STATE_DOCUMENT_DONE:
-      return printing::proto::PrintJobInfo_PrintJobStatus_PRINTED;
+      return proto::PrintJobInfo_PrintJobStatus_PRINTED;
     // Only completed print jobs are saved in the database so we shouldn't
     // handle other states.
     default:
       NOTREACHED();
   }
-  return printing::proto::PrintJobInfo_PrintJobStatus_CANCELED;
+  return proto::PrintJobInfo_PrintJobStatus_CANCELED;
 }
 
-printing::proto::Printer_PrinterSource PrinterSourceToProto(
+proto::Printer_PrinterSource PrinterSourceToProto(
     chromeos::Printer::Source source) {
   switch (source) {
     case chromeos::Printer::Source::SRC_USER_PREFS:
-      return printing::proto::Printer_PrinterSource_USER;
+      return proto::Printer_PrinterSource_USER;
     case chromeos::Printer::Source::SRC_POLICY:
-      return printing::proto::Printer_PrinterSource_POLICY;
+      return proto::Printer_PrinterSource_POLICY;
     default:
       NOTREACHED();
   }
-  return printing::proto::Printer_PrinterSource_USER;
+  return proto::Printer_PrinterSource_USER;
 }
 
 // Helper method to convert base::Time to the number of milliseconds past the
@@ -88,8 +89,8 @@ int64_t TimeToMillisecondsPastUnixEpoch(const base::Time& time) {
   return static_cast<int64_t>(time.ToJsTime());
 }
 
-printing::proto::Printer PrinterToProto(const chromeos::Printer& printer) {
-  printing::proto::Printer printer_proto;
+proto::Printer PrinterToProto(const chromeos::Printer& printer) {
+  proto::Printer printer_proto;
   printer_proto.set_name(printer.display_name());
   printer_proto.set_uri(printer.uri());
   printer_proto.set_source(PrinterSourceToProto(printer.source()));
@@ -98,9 +99,9 @@ printing::proto::Printer PrinterToProto(const chromeos::Printer& printer) {
 
 }  // namespace
 
-printing::proto::PrintSettings PrintSettingsToProto(
+proto::PrintSettings PrintSettingsToProto(
     const ::printing::PrintSettings& settings) {
-  printing::proto::PrintSettings settings_proto;
+  proto::PrintSettings settings_proto;
   settings_proto.set_color(ColorModelToProto(settings.color()));
   settings_proto.set_duplex(DuplexModeToProto(settings.duplex_mode()));
   *settings_proto.mutable_media_size() =
@@ -109,11 +110,10 @@ printing::proto::PrintSettings PrintSettingsToProto(
   return settings_proto;
 }
 
-printing::proto::PrintJobInfo CupsPrintJobToProto(
-    const CupsPrintJob& print_job,
-    const std::string& id,
-    const base::Time& completion_time) {
-  printing::proto::PrintJobInfo print_job_info_proto;
+proto::PrintJobInfo CupsPrintJobToProto(const CupsPrintJob& print_job,
+                                        const std::string& id,
+                                        const base::Time& completion_time) {
+  proto::PrintJobInfo print_job_info_proto;
   print_job_info_proto.set_id(id);
   print_job_info_proto.set_title(print_job.document_title());
   print_job_info_proto.set_source(PrintJobSourceToProto(print_job.source()));

chrome/browser/chromeos/printing/history/print_job_info_conversions.h → chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_CONVERSIONS_H_
-#define CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_CONVERSIONS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_PROTO_CONVERSIONS_H_
+#define CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_PROTO_CONVERSIONS_H_
 
 #include "chrome/browser/chromeos/printing/cups_print_job.h"
 #include "chrome/browser/chromeos/printing/history/print_job_info.pb.h"
@@ -24,4 +24,4 @@ printing::proto::PrintJobInfo CupsPrintJobToProto(
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_CONVERSIONS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_PRINTING_HISTORY_PRINT_JOB_INFO_PROTO_CONVERSIONS_H_

chrome/browser/chromeos/printing/history/print_job_info_conversions_unittest.cc → chrome/browser/chromeos/printing/history/print_job_info_proto_conversions_unittest.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/printing/history/print_job_info_conversions.h"
+#include "chrome/browser/chromeos/printing/history/print_job_info_proto_conversions.h"
 
 #include "base/time/time_override.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
-namespace pp = printing::proto;
+namespace proto = printing::proto;
 
 namespace {
 
@@ -29,7 +29,7 @@ constexpr int kPagesNumber = 3;
 
 }  // namespace
 
-TEST(PrintJobInfoConversionsTest, PrintSettingsToProto) {
+TEST(PrintJobInfoProtoConversionsTest, PrintSettingsToProto) {
   ::printing::PrintSettings settings;
   settings.set_color(::printing::ColorModel::COLOR);
   settings.set_duplex_mode(::printing::DuplexMode::LONG_EDGE);
@@ -39,11 +39,11 @@ TEST(PrintJobInfoConversionsTest, PrintSettingsToProto) {
   settings.set_requested_media(media);
   settings.set_copies(2);
 
-  pp::PrintSettings settings_proto = PrintSettingsToProto(settings);
-  const pp::MediaSize& media_size = settings_proto.media_size();
+  proto::PrintSettings settings_proto = PrintSettingsToProto(settings);
+  const proto::MediaSize& media_size = settings_proto.media_size();
 
-  EXPECT_EQ(pp::PrintSettings_ColorMode_COLOR, settings_proto.color());
-  EXPECT_EQ(pp::PrintSettings_DuplexMode_TWO_SIDED_LONG_EDGE,
+  EXPECT_EQ(proto::PrintSettings_ColorMode_COLOR, settings_proto.color());
+  EXPECT_EQ(proto::PrintSettings_DuplexMode_TWO_SIDED_LONG_EDGE,
             settings_proto.duplex());
   EXPECT_EQ(kWidth, media_size.width());
   EXPECT_EQ(kHeight, media_size.height());
@@ -51,7 +51,7 @@ TEST(PrintJobInfoConversionsTest, PrintSettingsToProto) {
   EXPECT_EQ(2, settings_proto.copies());
 }
 
-TEST(PrintJobInfoConversionsTest, CupsPrintJobToProto) {
+TEST(PrintJobInfoProtoConversionsTest, CupsPrintJobToProto) {
   // Override time so that base::Time::Now() always returns 1 second after the
   // epoch in Unix-like system (Jan 1, 1970).
   base::subtle::ScopedTimeClockOverrides time_override(
@@ -65,8 +65,8 @@ TEST(PrintJobInfoConversionsTest, CupsPrintJobToProto) {
   printer.set_uri(kUri);
   printer.set_source(chromeos::Printer::Source::SRC_POLICY);
 
-  pp::PrintSettings settings;
-  settings.set_color(pp::PrintSettings_ColorMode_COLOR);
+  proto::PrintSettings settings;
+  settings.set_color(proto::PrintSettings_ColorMode_COLOR);
 
   // CupsPrintJob computes the start time of the print job, that's why we have
   // to override base::Time::now() value for the test.
@@ -77,24 +77,24 @@ TEST(PrintJobInfoConversionsTest, CupsPrintJobToProto) {
   base::Time completion_time =
       base::Time::Now() + base::TimeDelta::FromSeconds(10);
 
-  pp::PrintJobInfo print_job_info_proto =
+  proto::PrintJobInfo print_job_info_proto =
       CupsPrintJobToProto(cups_print_job, kId, completion_time);
-  const pp::Printer& printer_proto = print_job_info_proto.printer();
+  const proto::Printer& printer_proto = print_job_info_proto.printer();
 
   EXPECT_EQ(kId, print_job_info_proto.id());
   EXPECT_EQ(kTitle, print_job_info_proto.title());
-  EXPECT_EQ(pp::PrintJobInfo_PrintJobSource_PRINT_PREVIEW,
+  EXPECT_EQ(proto::PrintJobInfo_PrintJobSource_PRINT_PREVIEW,
             print_job_info_proto.source());
   EXPECT_EQ(kSourceId, print_job_info_proto.source_id());
-  EXPECT_EQ(pp::PrintJobInfo_PrintJobStatus_FAILED,
+  EXPECT_EQ(proto::PrintJobInfo_PrintJobStatus_FAILED,
             print_job_info_proto.status());
   EXPECT_EQ(kJobCreationTime, print_job_info_proto.creation_time());
   EXPECT_EQ(kJobCreationTime + kJobDuration,
             print_job_info_proto.completion_time());
   EXPECT_EQ(kName, printer_proto.name());
   EXPECT_EQ(kUri, printer_proto.uri());
-  EXPECT_EQ(pp::Printer_PrinterSource_POLICY, printer_proto.source());
-  EXPECT_EQ(pp::PrintSettings_ColorMode_COLOR,
+  EXPECT_EQ(proto::Printer_PrinterSource_POLICY, printer_proto.source());
+  EXPECT_EQ(proto::PrintSettings_ColorMode_COLOR,
             print_job_info_proto.settings().color());
   EXPECT_EQ(kPagesNumber, print_job_info_proto.number_of_pages());
 }