Moved current cloud_devices content into cloud_devices/common.

TBR=jochen@chromium.org

Review URL: https://codereview.chromium.org/242243002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264745 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 522 insertions, 578 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 15b869b..10e2d91 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -15,6 +15,7 @@ include_rules = [
   "+components/bookmarks/core/browser",
   "+components/bookmarks/core/common",
   "+components/breakpad",
+  "+components/cloud_devices/common",
   "+components/data_reduction_proxy",
   "+components/dom_distiller",
   "+components/domain_reliability",
diff --git a/chrome/browser/local_discovery/DEPS b/chrome/browser/local_discovery/DEPS
index 28fe1f3..cc56ec5b 100644
--- a/chrome/browser/local_discovery/DEPS
+++ b/chrome/browser/local_discovery/DEPS
@@ -1,7 +1,3 @@
-include_rules = [
- "+components/cloud_devices",
-]
-
 specific_include_rules = {
   # For tests, it's fine to include utility process code.
   'test_service_discovery_client\.cc': [
diff --git a/chrome/browser/local_discovery/privet_http_impl.cc b/chrome/browser/local_discovery/privet_http_impl.cc
index fd351a2..19896c4 100644
--- a/chrome/browser/local_discovery/privet_http_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_impl.cc
@@ -14,7 +14,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/local_discovery/privet_constants.h"
-#include "components/cloud_devices/printer_description.h"
+#include "components/cloud_devices/common/printer_description.h"
 #include "net/base/url_util.h"
 #include "printing/pwg_raster_settings.h"
 #include "printing/units.h"
diff --git a/chrome/browser/local_discovery/privet_http_impl.h b/chrome/browser/local_discovery/privet_http_impl.h
index 535664a..1fcde73 100644
--- a/chrome/browser/local_discovery/privet_http_impl.h
+++ b/chrome/browser/local_discovery/privet_http_impl.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/local_discovery/privet_http.h"
-#include "components/cloud_devices/cloud_device_description.h"
+#include "components/cloud_devices/common/cloud_device_description.h"
 #include "printing/pdf_render_settings.h"
 
 namespace printing {
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ed51181..8731fdd 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1012,7 +1012,7 @@
             'common',
             'common_net',
             '../base/base.gyp:base',
-            '../components/components.gyp:cloud_devices',
+            '../components/components.gyp:cloud_devices_common',
             '../google_apis/google_apis.gyp:google_apis',
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0fc0ebd..f1fa87e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -29,7 +29,7 @@
         'suggestions_proto',
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:bookmarks_core_browser',
-        '../components/components.gyp:cloud_devices',
+        '../components/components.gyp:cloud_devices_common',
         '../components/components.gyp:data_reduction_proxy_browser',
         '../components/components.gyp:domain_reliability',
         '../components/components.gyp:favicon_base',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 1b831c3..68052a5 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -36,6 +36,7 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+        '<(DEPTH)/components/components.gyp:cloud_devices_common',
         '<(DEPTH)/components/components.gyp:json_schema',
         '<(DEPTH)/components/components.gyp:metrics',
         '<(DEPTH)/components/components.gyp:policy_component_common',
diff --git a/chrome/service/cloud_print/DEPS b/chrome/service/cloud_print/DEPS
index eede8f5..1ad9bbd 100644
--- a/chrome/service/cloud_print/DEPS
+++ b/chrome/service/cloud_print/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/cloud_devices",
+  "+components/cloud_devices/common",
   # sync notifier depends on the common jingle notifier classes.
   "+jingle/notifier",
 ]
diff --git a/chrome/service/cloud_print/cdd_conversion_win.cc b/chrome/service/cloud_print/cdd_conversion_win.cc
index 93fd836..dab6cd0 100644
--- a/chrome/service/cloud_print/cdd_conversion_win.cc
+++ b/chrome/service/cloud_print/cdd_conversion_win.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/service/cloud_print/cdd_conversion_win.h"
 
-#include "components/cloud_devices/printer_description.h"
+#include "components/cloud_devices/common/printer_description.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/win_helper.h"
 
diff --git a/components/cloud_devices.gypi b/components/cloud_devices.gypi
index 27adfd1..344ad68 100644
--- a/components/cloud_devices.gypi
+++ b/components/cloud_devices.gypi
@@ -5,7 +5,7 @@
 {
   'targets': [
     {
-      'target_name': 'cloud_devices',
+      'target_name': 'cloud_devices_common',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -14,14 +14,14 @@
         '../base/base.gyp:base',
       ],
       'sources': [
-        'cloud_devices/cloud_device_description.cc',
-        'cloud_devices/cloud_device_description.h',
-        'cloud_devices/cloud_device_description_consts.cc',
-        'cloud_devices/cloud_device_description_consts.h',
-        'cloud_devices/description_items.h',
-        'cloud_devices/description_items_inl.h',
-        'cloud_devices/printer_description.cc',
-        'cloud_devices/printer_description.h',
+        'cloud_devices/common/cloud_device_description.cc',
+        'cloud_devices/common/cloud_device_description.h',
+        'cloud_devices/common/cloud_device_description_consts.cc',
+        'cloud_devices/common/cloud_device_description_consts.h',
+        'cloud_devices/common/description_items.h',
+        'cloud_devices/common/description_items_inl.h',
+        'cloud_devices/common/printer_description.cc',
+        'cloud_devices/common/printer_description.h',
       ],
     },
   ],
diff --git a/components/cloud_devices/cloud_device_description.cc b/components/cloud_devices/common/cloud_device_description.cc
index baf544d..d1cb504 100644
--- a/components/cloud_devices/cloud_device_description.cc
+++ b/components/cloud_devices/common/cloud_device_description.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cloud_devices/cloud_device_description.h"
+#include "components/cloud_devices/common/cloud_device_description.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "components/cloud_devices/cloud_device_description_consts.h"
+#include "components/cloud_devices/common/cloud_device_description_consts.h"
 
 namespace cloud_devices {
 
@@ -46,9 +46,8 @@ bool CloudDeviceDescription::InitFromString(const std::string& json) {
 
 std::string CloudDeviceDescription::ToString() const {
   std::string json;
-  base::JSONWriter::WriteWithOptions(root_.get(),
-                                     base::JSONWriter::OPTIONS_PRETTY_PRINT,
-                                     &json);
+  base::JSONWriter::WriteWithOptions(
+      root_.get(), base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
   return json;
 }
 
diff --git a/components/cloud_devices/cloud_device_description.h b/components/cloud_devices/common/cloud_device_description.h
index d4ce081..8a00210 100644
--- a/components/cloud_devices/cloud_device_description.h
+++ b/components/cloud_devices/common/cloud_device_description.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 COMPONENTS_CLOUD_DEVICES_CLOUD_DEVICE_DESCRIPTION_H_
-#define COMPONENTS_CLOUD_DEVICES_CLOUD_DEVICE_DESCRIPTION_H_
+#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_H_
+#define COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_H_
 
 #include <string>
 
@@ -55,4 +55,4 @@ class CloudDeviceDescription {
 
 }  // namespace cloud_devices
 
-#endif  // COMPONENTS_CLOUD_DEVICES_CLOUD_DEVICE_DESCRIPTION_H_
+#endif  // COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_DEVICE_DESCRIPTION_H_
diff --git a/components/cloud_devices/cloud_device_description_consts.cc b/components/cloud_devices/common/cloud_device_description_consts.cc
index 79d9d92..9429870 100644
--- a/components/cloud_devices/cloud_device_description_consts.cc
+++ b/components/cloud_devices/common/cloud_device_description_consts.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cloud_devices/cloud_device_description_consts.h"
+#include "components/cloud_devices/common/cloud_device_description_consts.h"
 
 namespace cloud_devices {
 
diff --git a/components/cloud_devices/cloud_device_description_consts.h b/components/cloud_devices/common/cloud_device_description_consts.h
index 77443c9..77443c9 100644
--- a/components/cloud_devices/cloud_device_description_consts.h
+++ b/components/cloud_devices/common/cloud_device_description_consts.h
diff --git a/components/cloud_devices/description_items.h b/components/cloud_devices/common/description_items.h
index 383aa55..1e8ed53 100644
--- a/components/cloud_devices/description_items.h
+++ b/components/cloud_devices/common/description_items.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 COMPONENTS_CLOUD_DEVICES_CAPABILITY_INTERFACES_H_
-#define COMPONENTS_CLOUD_DEVICES_CAPABILITY_INTERFACES_H_
+#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_CAPABILITY_INTERFACES_H_
+#define COMPONENTS_CLOUD_DEVICES_COMMON_CAPABILITY_INTERFACES_H_
 
 // Defines common templates that could be used to create device specific
 // capabilities and print tickets.
@@ -12,7 +12,7 @@
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
-#include "components/cloud_devices/cloud_device_description.h"
+#include "components/cloud_devices/common/cloud_device_description.h"
 
 namespace base {
 class DictionaryValue;
@@ -48,32 +48,22 @@ class ListCapability {
   bool LoadFrom(const CloudDeviceDescription& description);
   void SaveTo(CloudDeviceDescription* description) const;
 
-  void Reset() {
-    options_.clear();
-  }
+  void Reset() { options_.clear(); }
 
   bool IsValid() const;
 
-  bool empty() const {
-    return options_.empty();
-  }
+  bool empty() const { return options_.empty(); }
 
-  size_t size() const {
-    return options_.size();
-  }
+  size_t size() const { return options_.size(); }
 
-  const Option& operator[](size_t i) const {
-    return options_[i];
-  }
+  const Option& operator[](size_t i) const { return options_[i]; }
 
-  bool Contains(const Option& option) const{
+  bool Contains(const Option& option) const {
     return std::find(options_.begin(), options_.end(), option) !=
            options_.end();
   }
 
-  void AddOption(const Option& option) {
-    options_.push_back(option);
-  }
+  void AddOption(const Option& option) { options_.push_back(option); }
 
  private:
   typedef std::vector<Option> OptionVector;
@@ -103,19 +93,13 @@ class SelectionCapability {
 
   bool IsValid() const;
 
-  bool empty() const {
-    return options_.empty();
-  }
+  bool empty() const { return options_.empty(); }
 
-  size_t size() const {
-    return options_.size();
-  }
+  size_t size() const { return options_.size(); }
 
-  const Option& operator[](size_t i) const {
-    return options_[i];
-  }
+  const Option& operator[](size_t i) const { return options_[i]; }
 
-  bool Contains(const Option& option) const{
+  bool Contains(const Option& option) const {
     return std::find(options_.begin(), options_.end(), option) !=
            options_.end();
   }
@@ -125,9 +109,7 @@ class SelectionCapability {
     return options_[default_idx_];
   }
 
-  void AddOption(const Option& option) {
-    AddDefaultOption(option, false);
-  }
+  void AddOption(const Option& option) { AddDefaultOption(option, false); }
 
   void AddDefaultOption(const Option& option, bool is_default) {
     if (is_default) {
@@ -159,17 +141,11 @@ class BooleanCapability {
   bool LoadFrom(const CloudDeviceDescription& description);
   void SaveTo(CloudDeviceDescription* description) const;
 
-  void Reset() {
-    default_value_ = false;
-  }
+  void Reset() { default_value_ = false; }
 
-  void set_default_value(bool value) {
-    default_value_ = value;
-  }
+  void set_default_value(bool value) { default_value_ = value; }
 
-  bool default_value() const {
-    return default_value_;
-  }
+  bool default_value() const { return default_value_; }
 
  private:
   bool default_value_;
@@ -233,19 +209,13 @@ class TicketItem {
   bool LoadFrom(const CloudDeviceDescription& description);
   void SaveTo(CloudDeviceDescription* description) const;
 
-  void Reset() {
-    value_ = Option();
-  }
+  void Reset() { value_ = Option(); }
 
   bool IsValid() const;
 
-  const Option& value() const {
-    return value_;
-  }
+  const Option& value() const { return value_; }
 
-  void set_value(const Option& value) {
-    value_ = value;
-  }
+  void set_value(const Option& value) { value_ = value; }
 
  private:
   Option value_;
@@ -255,4 +225,4 @@ class TicketItem {
 
 }  // namespace cloud_devices
 
-#endif  // COMPONENTS_CLOUD_DEVICES_CAPABILITY_INTERFACES_H_
+#endif  // COMPONENTS_CLOUD_DEVICES_COMMON_CAPABILITY_INTERFACES_H_
diff --git a/components/cloud_devices/description_items_inl.h b/components/cloud_devices/common/description_items_inl.h
index 6254890..a4302bc 100644
--- a/components/cloud_devices/description_items_inl.h
+++ b/components/cloud_devices/common/description_items_inl.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_CLOUD_DEVICES_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
-#define COMPONENTS_CLOUD_DEVICES_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
+#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
+#define COMPONENTS_CLOUD_DEVICES_COMMON_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
 
 #include <vector>
 
 #include "base/numerics/safe_conversions.h"
-#include "components/cloud_devices/description_items.h"
+#include "components/cloud_devices/common/description_items.h"
 
 // Implementation of templates defined in header file.
 // This file should be included from CC file with implementation of device
@@ -22,7 +22,8 @@ ListCapability<Option, Traits>::ListCapability() {
 }
 
 template <class Option, class Traits>
-ListCapability<Option, Traits>::~ListCapability() { }
+ListCapability<Option, Traits>::~ListCapability() {
+}
 
 template <class Option, class Traits>
 bool ListCapability<Option, Traits>::IsValid() const {
@@ -74,7 +75,8 @@ SelectionCapability<Option, Traits>::SelectionCapability() {
 }
 
 template <class Option, class Traits>
-SelectionCapability<Option, Traits>::~SelectionCapability() { }
+SelectionCapability<Option, Traits>::~SelectionCapability() {
+}
 
 template <class Option, class Traits>
 bool SelectionCapability<Option, Traits>::IsValid() const {
@@ -120,8 +122,8 @@ void SelectionCapability<Option, Traits>::SaveTo(
     CloudDeviceDescription* description) const {
   DCHECK(IsValid());
   base::ListValue* options_list = new base::ListValue;
-  description->CreateItem(Traits::GetCapabilityPath())->Set(json::kKeyOption,
-                                                            options_list);
+  description->CreateItem(Traits::GetCapabilityPath())
+      ->Set(json::kKeyOption, options_list);
   for (size_t i = 0; i < options_.size(); ++i) {
     base::DictionaryValue* option_value = new base::DictionaryValue;
     options_list->Append(option_value);
@@ -137,7 +139,8 @@ BooleanCapability<Traits>::BooleanCapability() {
 }
 
 template <class Traits>
-BooleanCapability<Traits>::~BooleanCapability() { }
+BooleanCapability<Traits>::~BooleanCapability() {
+}
 
 template <class Traits>
 bool BooleanCapability<Traits>::LoadFrom(
@@ -179,7 +182,8 @@ ValueCapability<Option, Traits>::ValueCapability() {
 }
 
 template <class Option, class Traits>
-ValueCapability<Option, Traits>::~ValueCapability() {}
+ValueCapability<Option, Traits>::~ValueCapability() {
+}
 
 template <class Option, class Traits>
 bool ValueCapability<Option, Traits>::IsValid() const {
@@ -214,7 +218,8 @@ TicketItem<Option, Traits>::TicketItem() {
 }
 
 template <class Option, class Traits>
-TicketItem<Option, Traits>::~TicketItem() { }
+TicketItem<Option, Traits>::~TicketItem() {
+}
 
 template <class Option, class Traits>
 bool TicketItem<Option, Traits>::IsValid() const {
@@ -245,4 +250,4 @@ void TicketItem<Option, Traits>::SaveTo(
 
 }  // namespace cloud_devices
 
-#endif  // COMPONENTS_CLOUD_DEVICES_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
+#endif  // COMPONENTS_CLOUD_DEVICES_COMMON_DESCRIPTION_DESCRIPTION_ITEMS_INL_H_
diff --git a/components/cloud_devices/printer_description.cc b/components/cloud_devices/common/printer_description.cc
index 8efb576..8697795 100644
--- a/components/cloud_devices/printer_description.cc
+++ b/components/cloud_devices/common/printer_description.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cloud_devices/printer_description.h"
+#include "components/cloud_devices/common/printer_description.h"
 
 #include <algorithm>
 
@@ -10,8 +10,8 @@
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "components/cloud_devices/cloud_device_description_consts.h"
-#include "components/cloud_devices/description_items_inl.h"
+#include "components/cloud_devices/common/cloud_device_description_consts.h"
+#include "components/cloud_devices/common/description_items_inl.h"
 
 namespace cloud_devices {
 
@@ -98,49 +98,49 @@ const struct ColorNames {
   ColorType id;
   const char* const json_name;
 } kColorNames[] = {
-  { STANDARD_COLOR, kTypeColorColor },
-  { STANDARD_MONOCHROME, kTypeColorMonochrome },
-  { CUSTOM_COLOR, kTypeColorCustomColor },
-  { CUSTOM_MONOCHROME, kTypeColorCustomMonochrome },
-  { AUTO_COLOR, kTypeColorAuto },
+      {STANDARD_COLOR, kTypeColorColor},
+      {STANDARD_MONOCHROME, kTypeColorMonochrome},
+      {CUSTOM_COLOR, kTypeColorCustomColor},
+      {CUSTOM_MONOCHROME, kTypeColorCustomMonochrome},
+      {AUTO_COLOR, kTypeColorAuto},
 };
 
 const struct DuplexNames {
   DuplexType id;
   const char* const json_name;
 } kDuplexNames[] = {
-  { NO_DUPLEX, kTypeDuplexNoDuplex },
-  { LONG_EDGE, kTypeDuplexLongEdge },
-  { SHORT_EDGE, kTypeDuplexShortEdge },
+      {NO_DUPLEX, kTypeDuplexNoDuplex},
+      {LONG_EDGE, kTypeDuplexLongEdge},
+      {SHORT_EDGE, kTypeDuplexShortEdge},
 };
 
 const struct OrientationNames {
   OrientationType id;
   const char* const json_name;
 } kOrientationNames[] = {
-  { PORTRAIT, kTypeOrientationPortrait },
-  { LANDSCAPE, kTypeOrientationLandscape },
-  { AUTO_ORIENTATION, kTypeOrientationAuto },
+      {PORTRAIT, kTypeOrientationPortrait},
+      {LANDSCAPE, kTypeOrientationLandscape},
+      {AUTO_ORIENTATION, kTypeOrientationAuto},
 };
 
 const struct MarginsNames {
   MarginsType id;
   const char* const json_name;
 } kMarginsNames[] = {
-  { NO_MARGINS, kTypeMarginsBorderless },
-  { STANDARD_MARGINS, kTypeMarginsStandard },
-  { CUSTOM_MARGINS, kTypeMarginsCustom },
+      {NO_MARGINS, kTypeMarginsBorderless},
+      {STANDARD_MARGINS, kTypeMarginsStandard},
+      {CUSTOM_MARGINS, kTypeMarginsCustom},
 };
 
 const struct FitToPageNames {
   FitToPageType id;
   const char* const json_name;
 } kFitToPageNames[] = {
-  { NO_FITTING, kTypeFitToPageNoFitting },
-  { FIT_TO_PAGE, kTypeFitToPageFitToPage },
-  { GROW_TO_PAGE, kTypeFitToPageGrowToPage },
-  { SHRINK_TO_PAGE, kTypeFitToPageShrinkToPage },
-  { FILL_PAGE, kTypeFitToPageFillPage },
+      {NO_FITTING, kTypeFitToPageNoFitting},
+      {FIT_TO_PAGE, kTypeFitToPageFitToPage},
+      {GROW_TO_PAGE, kTypeFitToPageGrowToPage},
+      {SHRINK_TO_PAGE, kTypeFitToPageShrinkToPage},
+      {FILL_PAGE, kTypeFitToPageFillPage},
 };
 
 const struct DocumentSheetBackNames {
@@ -157,9 +157,10 @@ const int32 kMmToUm = 1000;
 const int32 kSizeTrasholdUm = 1000;
 
 #define MAP_CLOUD_PRINT_MEDIA_TYPE(type, width, height, unit_um) \
-    { type, #type, \
-      static_cast<int>(width * unit_um + 0.5), \
-      static_cast<int>(height * unit_um + 0.5) }
+  {                                                              \
+    type, #type, static_cast<int>(width* unit_um + 0.5),         \
+        static_cast<int>(height* unit_um + 0.5)                  \
+  }
 
 const struct MadiaDefinition {
   MediaType id;
@@ -167,172 +168,171 @@ const struct MadiaDefinition {
   int width_um;
   int height_um;
 } kMediaDefinitions[] = {
-  { CUSTOM_MEDIA, "CUSTOM" , 0, 0},
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_3X5, 3, 5, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_PERSONAL, 3.625f, 6.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_MONARCH, 3.875f, 7.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_9, 3.875f, 8.875f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_4X6, 4, 6, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_10, 4.125f, 9.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_A2, 4.375f, 5.75f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_11, 4.5f, 10.375f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_12, 4.75f, 11, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_5X7, 5, 7, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_5X8, 5, 8, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_14, 5, 11.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INVOICE, 5.5f, 8.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_4X6_EXT, 6, 8, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_6X9, 6, 9, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_C5, 6.5f, 9.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_7X9, 7, 9, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EXECUTIVE, 7.25f, 10.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_GOVT_LETTER, 8, 10, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_GOVT_LEGAL, 8, 13, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_QUARTO, 8.5f, 10.83f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER, 8.5f, 11, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FANFOLD_EUR, 8.5f, 12, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER_PLUS, 8.5f, 12.69f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FOOLSCAP, 8.5f, 13, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEGAL, 8.5f, 14, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_SUPER_A, 8.94f, 14, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_9X11, 9, 11, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_A, 9, 12, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER_EXTRA, 9.5f, 12, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEGAL_EXTRA, 9.5f, 15, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X11, 10, 11, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X13, 10, 13, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X14, 10, 14, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X15, 10, 15, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_11X12, 11, 12, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EDP, 11, 14, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FANFOLD_US, 11, 14.875f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_11X15, 11, 15, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEDGER, 11, 17, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EUR_EDP, 12, 14, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_B, 12, 18, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_12X19, 12, 19, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_B_PLUS, 12, 19.17f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_SUPER_B, 13, 19, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_C, 17, 22, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_C, 18, 24, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_D, 22, 34, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_D, 24, 36, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ASME_F, 28, 40, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_WIDE_FORMAT, 30, 42, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_E, 34, 44, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_E, 36, 48, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(NA_F, 44, 68, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ROC_16K, 7.75f, 10.75f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ROC_8K, 10.75f, 15.5f, kInchToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_32K, 97, 151, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_1, 102, 165, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_2, 102, 176, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_4, 110, 208, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_5, 110, 220, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_8, 120, 309, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_6, 120, 230, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_3, 125, 176, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_16K, 146, 215, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_7, 160, 230, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_JUURO_KU_KAI, 198, 275, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_PA_KAI, 267, 389, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_DAI_PA_KAI, 275, 395, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_10, 324, 458, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A10, 26, 37, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A9, 37, 52, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A8, 52, 74, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A7, 74, 105, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A6, 105, 148, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A5, 148, 210, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A5_EXTRA, 174, 235, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4, 210, 297, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4_TAB, 225, 297, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4_EXTRA, 235, 322, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3, 297, 420, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X3, 297, 630, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X4, 297, 841, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X5, 297, 1051, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X6, 297, 1261, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X7, 297, 1471, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X8, 297, 1682, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X9, 297, 1892, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3_EXTRA, 322, 445, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2, 420, 594, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X3, 420, 891, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X4, 420, 1189, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X5, 420, 1486, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X6, 420, 1783, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X7, 420, 2080, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1, 594, 841, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X3, 594, 1261, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X4, 594, 1682, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X5, 594, 2102, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A0, 841, 1189, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1X3, 841, 1783, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1X4, 841, 2378, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_2A0, 1189, 1682, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A0X3, 1189, 2523, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B10, 31, 44, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B9, 44, 62, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B8, 62, 88, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B7, 88, 125, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B6, 125, 176, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B6C4, 125, 324, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B5, 176, 250, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B5_EXTRA, 201, 276, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B4, 250, 353, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B3, 353, 500, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B2, 500, 707, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B1, 707, 1000, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B0, 1000, 1414, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C10, 28, 40, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C9, 40, 57, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C8, 57, 81, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C7, 81, 114, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C7C6, 81, 162, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C6, 114, 162, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C6C5, 114, 229, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C5, 162, 229, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C4, 229, 324, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C3, 324, 458, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C2, 458, 648, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C1, 648, 917, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C0, 917, 1297, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_DL, 110, 220, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA2, 430, 610, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA2, 450, 640, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA1, 610, 860, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA1, 640, 900, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA0, 860, 1220, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA0, 900, 1280, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B10, 32, 45, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B9, 45, 64, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B8, 64, 91, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B7, 91, 128, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B6, 128, 182, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B5, 182, 257, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B4, 257, 364, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B3, 364, 515, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B2, 515, 728, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B1, 728, 1030, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B0, 1030, 1456, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_EXEC, 216, 330, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU4, 90, 205, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_HAGAKI, 100, 148, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_YOU4, 105, 235, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU2, 111.1f, 146, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU3, 120, 235, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_OUFUKU, 148, 200, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_KAHU, 240, 322.1f, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_KAKU2, 240, 332, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_SMALL_PHOTO, 100, 150, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_ITALIAN, 110, 230, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_POSTFIX, 114, 229, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_LARGE_PHOTO, 200, 300, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO, 210, 330, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO_SP, 215, 315, kMmToUm),
-  MAP_CLOUD_PRINT_MEDIA_TYPE(OM_INVITE, 220, 220, kMmToUm)
-};
+      {CUSTOM_MEDIA, "CUSTOM", 0, 0},
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_3X5, 3, 5, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_PERSONAL, 3.625f, 6.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_MONARCH, 3.875f, 7.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_9, 3.875f, 8.875f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_4X6, 4, 6, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_10, 4.125f, 9.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_A2, 4.375f, 5.75f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_11, 4.5f, 10.375f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_12, 4.75f, 11, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_5X7, 5, 7, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_5X8, 5, 8, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_NUMBER_14, 5, 11.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INVOICE, 5.5f, 8.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_INDEX_4X6_EXT, 6, 8, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_6X9, 6, 9, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_C5, 6.5f, 9.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_7X9, 7, 9, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EXECUTIVE, 7.25f, 10.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_GOVT_LETTER, 8, 10, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_GOVT_LEGAL, 8, 13, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_QUARTO, 8.5f, 10.83f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER, 8.5f, 11, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FANFOLD_EUR, 8.5f, 12, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER_PLUS, 8.5f, 12.69f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FOOLSCAP, 8.5f, 13, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEGAL, 8.5f, 14, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_SUPER_A, 8.94f, 14, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_9X11, 9, 11, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_A, 9, 12, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LETTER_EXTRA, 9.5f, 12, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEGAL_EXTRA, 9.5f, 15, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X11, 10, 11, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X13, 10, 13, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X14, 10, 14, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_10X15, 10, 15, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_11X12, 11, 12, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EDP, 11, 14, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_FANFOLD_US, 11, 14.875f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_11X15, 11, 15, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_LEDGER, 11, 17, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_EUR_EDP, 12, 14, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_B, 12, 18, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_12X19, 12, 19, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_B_PLUS, 12, 19.17f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_SUPER_B, 13, 19, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_C, 17, 22, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_C, 18, 24, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_D, 22, 34, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_D, 24, 36, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ASME_F, 28, 40, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_WIDE_FORMAT, 30, 42, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_E, 34, 44, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_ARCH_E, 36, 48, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(NA_F, 44, 68, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ROC_16K, 7.75f, 10.75f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ROC_8K, 10.75f, 15.5f, kInchToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_32K, 97, 151, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_1, 102, 165, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_2, 102, 176, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_4, 110, 208, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_5, 110, 220, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_8, 120, 309, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_6, 120, 230, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_3, 125, 176, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_16K, 146, 215, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_7, 160, 230, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_JUURO_KU_KAI, 198, 275, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_PA_KAI, 267, 389, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_DAI_PA_KAI, 275, 395, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(PRC_10, 324, 458, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A10, 26, 37, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A9, 37, 52, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A8, 52, 74, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A7, 74, 105, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A6, 105, 148, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A5, 148, 210, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A5_EXTRA, 174, 235, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4, 210, 297, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4_TAB, 225, 297, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4_EXTRA, 235, 322, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3, 297, 420, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X3, 297, 630, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X4, 297, 841, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X5, 297, 1051, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X6, 297, 1261, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X7, 297, 1471, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X8, 297, 1682, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A4X9, 297, 1892, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3_EXTRA, 322, 445, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2, 420, 594, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X3, 420, 891, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X4, 420, 1189, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X5, 420, 1486, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X6, 420, 1783, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A3X7, 420, 2080, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1, 594, 841, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X3, 594, 1261, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X4, 594, 1682, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A2X5, 594, 2102, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A0, 841, 1189, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1X3, 841, 1783, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A1X4, 841, 2378, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_2A0, 1189, 1682, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_A0X3, 1189, 2523, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B10, 31, 44, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B9, 44, 62, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B8, 62, 88, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B7, 88, 125, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B6, 125, 176, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B6C4, 125, 324, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B5, 176, 250, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B5_EXTRA, 201, 276, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B4, 250, 353, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B3, 353, 500, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B2, 500, 707, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B1, 707, 1000, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_B0, 1000, 1414, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C10, 28, 40, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C9, 40, 57, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C8, 57, 81, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C7, 81, 114, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C7C6, 81, 162, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C6, 114, 162, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C6C5, 114, 229, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C5, 162, 229, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C4, 229, 324, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C3, 324, 458, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C2, 458, 648, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C1, 648, 917, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_C0, 917, 1297, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_DL, 110, 220, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA2, 430, 610, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA2, 450, 640, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA1, 610, 860, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA1, 640, 900, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_RA0, 860, 1220, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(ISO_SRA0, 900, 1280, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B10, 32, 45, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B9, 45, 64, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B8, 64, 91, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B7, 91, 128, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B6, 128, 182, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B5, 182, 257, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B4, 257, 364, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B3, 364, 515, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B2, 515, 728, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B1, 728, 1030, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_B0, 1030, 1456, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JIS_EXEC, 216, 330, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU4, 90, 205, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_HAGAKI, 100, 148, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_YOU4, 105, 235, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU2, 111.1f, 146, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_CHOU3, 120, 235, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_OUFUKU, 148, 200, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_KAHU, 240, 322.1f, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(JPN_KAKU2, 240, 332, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_SMALL_PHOTO, 100, 150, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_ITALIAN, 110, 230, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_POSTFIX, 114, 229, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_LARGE_PHOTO, 200, 300, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO, 210, 330, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_FOLIO_SP, 215, 315, kMmToUm),
+      MAP_CLOUD_PRINT_MEDIA_TYPE(OM_INVITE, 220, 220, kMmToUm)};
 #undef MAP_CLOUD_PRINT_MEDIA_TYPE
 
 const MadiaDefinition* FindMediaBySize(int32 width_um, int32 height_um) {
@@ -346,7 +346,7 @@ const MadiaDefinition* FindMediaBySize(int32 width_um, int32 height_um) {
   return result;
 }
 
-template<class T, class IdType>
+template <class T, class IdType>
 std::string TypeToString(const T& names, IdType id) {
   for (size_t i = 0; i < arraysize(names); ++i) {
     if (id == names[i].id)
@@ -356,7 +356,7 @@ std::string TypeToString(const T& names, IdType id) {
   return std::string();
 }
 
-template<class T, class IdType>
+template <class T, class IdType>
 bool TypeFromString(const T& names, const std::string& type, IdType* id) {
   for (size_t i = 0; i < arraysize(names); ++i) {
     if (type == names[i].json_name) {
@@ -372,11 +372,14 @@ bool TypeFromString(const T& names, const std::string& type, IdType* id) {
 PwgRasterConfig::PwgRasterConfig()
     : document_sheet_back(ROTATED),
       reverse_order_streaming(false),
-      rotate_all_pages(false) {}
+      rotate_all_pages(false) {
+}
 
-Color::Color() : type(AUTO_COLOR) {}
+Color::Color() : type(AUTO_COLOR) {
+}
 
-Color::Color(ColorType type) : type(type) {}
+Color::Color(ColorType type) : type(type) {
+}
 
 bool Color::operator==(const Color& other) const {
   return type == other.type && vendor_id == other.vendor_id &&
@@ -390,11 +393,7 @@ bool Color::IsValid() const {
 }
 
 Margins::Margins()
-    : type(STANDARD_MARGINS),
-      top_um(0),
-      right_um(0),
-      bottom_um(0),
-      left_um(0) {
+    : type(STANDARD_MARGINS), top_um(0), right_um(0), bottom_um(0), left_um(0) {
 }
 
 Margins::Margins(MarginsType type,
@@ -410,16 +409,16 @@ Margins::Margins(MarginsType type,
 }
 
 bool Margins::operator==(const Margins& other) const {
-  return type == other.type &&
-         top_um == other.top_um &&
-         right_um == other.right_um &&
-         bottom_um == other.bottom_um;
+  return type == other.type && top_um == other.top_um &&
+         right_um == other.right_um && bottom_um == other.bottom_um;
 }
 
-Dpi::Dpi() : horizontal(0), vertical(0) {}
+Dpi::Dpi() : horizontal(0), vertical(0) {
+}
 
 Dpi::Dpi(int32 horizontal, int32 vertical)
-    : horizontal(horizontal), vertical(vertical) {}
+    : horizontal(horizontal), vertical(vertical) {
+}
 
 bool Dpi::IsValid() const {
   return horizontal > 0 && vertical > 0;
@@ -430,11 +429,7 @@ bool Dpi::operator==(const Dpi& other) const {
 }
 
 Media::Media()
-    : type(CUSTOM_MEDIA),
-      width_um(0),
-      height_um(0),
-      is_continuous_feed(false) {
-
+    : type(CUSTOM_MEDIA), width_um(0), height_um(0), is_continuous_feed(false) {
 }
 
 Media::Media(MediaType type, int32 width_um, int32 height_um)
@@ -444,7 +439,8 @@ Media::Media(MediaType type, int32 width_um, int32 height_um)
       is_continuous_feed(width_um <= 0 || height_um <= 0) {
 }
 
-Media::Media(const std::string& custom_display_name, int32 width_um,
+Media::Media(const std::string& custom_display_name,
+             int32 width_um,
              int32 height_um)
     : type(CUSTOM_MEDIA),
       width_um(width_um),
@@ -474,25 +470,25 @@ bool Media::IsValid() const {
 }
 
 bool Media::operator==(const Media& other) const {
-  return type == other.type &&
-         width_um == other.width_um &&
+  return type == other.type && width_um == other.width_um &&
          height_um == other.height_um &&
          is_continuous_feed == other.is_continuous_feed;
 }
 
-Interval::Interval() : start(0), end(0) {}
+Interval::Interval() : start(0), end(0) {
+}
 
-Interval::Interval(int32 start, int32 end)
-    : start(start), end(end) {}
+Interval::Interval(int32 start, int32 end) : start(start), end(end) {
+}
 
-Interval::Interval(int32 start)
-    : start(start), end(kMaxPageNumber) {}
+Interval::Interval(int32 start) : start(start), end(kMaxPageNumber) {
+}
 
 bool Interval::operator==(const Interval& other) const {
   return start == other.start && end == other.end;
 }
 
-template<const char* kName>
+template <const char* kName>
 class ItemsTraits {
  public:
   static std::string GetCapabilityPath() {
@@ -566,9 +562,7 @@ class PwgRasterConfigTraits : public NoValueValidation,
 
 class ColorTraits : public ItemsTraits<kOptionColor> {
  public:
-  static bool IsValid(const Color& option) {
-    return option.IsValid();
-  }
+  static bool IsValid(const Color& option) { return option.IsValid(); }
 
   static bool Load(const base::DictionaryValue& dict, Color* option) {
     std::string type_str;
@@ -620,9 +614,7 @@ class OrientationTraits : public NoValueValidation,
 
 class CopiesTraits : public ItemsTraits<kOptionCopies> {
  public:
-  static bool IsValid(int32 option) {
-    return option >= 1;
-  }
+  static bool IsValid(int32 option) { return option >= 1; }
 
   static bool Load(const base::DictionaryValue& dict, int32* option) {
     return dict.GetInteger(kOptionCopies, option);
@@ -642,11 +634,10 @@ class MarginsTraits : public NoValueValidation,
       return false;
     if (!TypeFromString(kMarginsNames, type_str, &option->type))
       return false;
-    return
-        dict.GetInteger(kMargineTop, &option->top_um) &&
-        dict.GetInteger(kMargineRight, &option->right_um) &&
-        dict.GetInteger(kMargineBottom, &option->bottom_um) &&
-        dict.GetInteger(kMargineLeft, &option->left_um);
+    return dict.GetInteger(kMargineTop, &option->top_um) &&
+           dict.GetInteger(kMargineRight, &option->right_um) &&
+           dict.GetInteger(kMargineBottom, &option->bottom_um) &&
+           dict.GetInteger(kMargineLeft, &option->left_um);
   }
 
   static void Save(const Margins& option, base::DictionaryValue* dict) {
@@ -660,9 +651,7 @@ class MarginsTraits : public NoValueValidation,
 
 class DpiTraits : public ItemsTraits<kOptionDpi> {
  public:
-  static bool IsValid(const Dpi& option) {
-    return option.IsValid();
-  }
+  static bool IsValid(const Dpi& option) { return option.IsValid(); }
 
   static bool Load(const base::DictionaryValue& dict, Dpi* option) {
     if (!dict.GetInteger(kDpiHorizontal, &option->horizontal) ||
@@ -736,9 +725,7 @@ class PageRangeTraits : public ItemsTraits<kOptionPageRange> {
 
 class MediaTraits : public ItemsTraits<kOptionMediaSize> {
  public:
-  static bool IsValid(const Media& option) {
-    return option.IsValid();
-  }
+  static bool IsValid(const Media& option) { return option.IsValid(); }
 
   static bool Load(const base::DictionaryValue& dict, Media* option) {
     std::string type_str;
diff --git a/components/cloud_devices/printer_description.h b/components/cloud_devices/common/printer_description.h
index cdfd20e..74225ff 100644
--- a/components/cloud_devices/printer_description.h
+++ b/components/cloud_devices/common/printer_description.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_CLOUD_DEVICES_CLOUD_PRINTER_DESCRIPTION_H_
-#define COMPONENTS_CLOUD_DEVICES_CLOUD_PRINTER_DESCRIPTION_H_
+#ifndef COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_PRINTER_DESCRIPTION_H_
+#define COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_PRINTER_DESCRIPTION_H_
 
 #include <string>
 
 #include "base/logging.h"
-#include "components/cloud_devices/description_items.h"
+#include "components/cloud_devices/common/description_items.h"
 
 // Defines printer options, CDD and CJT items.
 // https://developers.google.com/cloud-print/docs/cdd
@@ -19,12 +19,7 @@ namespace printer {
 
 typedef std::string ContentType;
 
-enum DocumentSheetBack {
-  NORMAL,
-  ROTATED,
-  MANUAL_TUMBLE,
-  FLIPPED
-};
+enum DocumentSheetBack { NORMAL, ROTATED, MANUAL_TUMBLE, FLIPPED };
 
 struct PwgRasterConfig {
   PwgRasterConfig();
@@ -48,9 +43,7 @@ struct Color {
 
   bool IsValid() const;
   bool operator==(const Color& other) const;
-  bool operator!=(const Color& other) const {
-    return !(*this == other);
-  }
+  bool operator!=(const Color& other) const { return !(*this == other); }
 
   ColorType type;
   std::string vendor_id;
@@ -84,9 +77,7 @@ struct Margins {
           int32 left_um);
 
   bool operator==(const Margins& other) const;
-  bool operator!=(const Margins& other) const {
-    return !(*this == other);
-  }
+  bool operator!=(const Margins& other) const { return !(*this == other); }
 
   MarginsType type;
   int32 top_um;
@@ -101,9 +92,7 @@ struct Dpi {
 
   bool IsValid() const;
   bool operator==(const Dpi& other) const;
-  bool operator!=(const Dpi& other) const {
-    return !(*this == other);
-  }
+  bool operator!=(const Dpi& other) const { return !(*this == other); }
 
   int32 horizontal;
   int32 vertical;
@@ -301,15 +290,14 @@ struct Media {
   Media(MediaType type, int32 width_um, int32 height_um);
 
   Media(const std::string& custom_display_name,
-        int32 width_um, int32 height_um);
+        int32 width_um,
+        int32 height_um);
 
   bool MatchBySize();
 
   bool IsValid() const;
   bool operator==(const Media& other) const;
-  bool operator!=(const Media& other) const {
-    return !(*this == other);
-  }
+  bool operator!=(const Media& other) const { return !(*this == other); }
 
   MediaType type;
   int32 width_um;
@@ -324,9 +312,7 @@ struct Interval {
   Interval(int32 start);
 
   bool operator==(const Interval& other) const;
-  bool operator!=(const Interval& other) const {
-    return !(*this == other);
-  }
+  bool operator!=(const Interval& other) const { return !(*this == other); }
 
   int32 start;
   int32 end;
@@ -352,8 +338,8 @@ typedef ValueCapability<PwgRasterConfig, PwgRasterConfigTraits>
     PwgRasterConfigCapability;
 typedef SelectionCapability<Color, ColorTraits> ColorCapability;
 typedef SelectionCapability<DuplexType, DuplexTraits> DuplexCapability;
-typedef SelectionCapability<OrientationType,
-                            OrientationTraits> OrientationCapability;
+typedef SelectionCapability<OrientationType, OrientationTraits>
+    OrientationCapability;
 typedef SelectionCapability<Margins, MarginsTraits> MarginsCapability;
 typedef SelectionCapability<Dpi, DpiTraits> DpiCapability;
 typedef SelectionCapability<FitToPageType, FitToPageTraits> FitToPageCapability;
@@ -381,4 +367,4 @@ typedef TicketItem<bool, ReverseTraits> ReverseTicketItem;
 
 }  // namespace cloud_devices
 
-#endif  // COMPONENTS_CLOUD_DEVICES_CLOUD_PRINTER_DESCRIPTION_H_
+#endif  // COMPONENTS_CLOUD_DEVICES_COMMON_CLOUD_PRINTER_DESCRIPTION_H_
diff --git a/components/cloud_devices/printer_description_unittest.cc b/components/cloud_devices/common/printer_description_unittest.cc
index 41923ea..519409e 100644
--- a/components/cloud_devices/printer_description_unittest.cc
+++ b/components/cloud_devices/common/printer_description_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/cloud_devices/printer_description.h"
+#include "components/cloud_devices/common/printer_description.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -27,239 +27,238 @@ std::string NormalizeJson(const std::string& json) {
 }
 
 const char kCdd[] =
-"{"
-"  'version': '1.0',"
-"  'printer': {"
-"    'supported_content_type': [ {"
-"      'content_type': 'image/pwg-raster'"
-"    }, {"
-"      'content_type': 'image/jpeg'"
-"    } ],"
-"    'pwg_raster_config' : {"
-"      'document_sheet_back' : 'MANUAL_TUMBLE',"
-"      'reverse_order_streaming': true"
-"    },"
-"    'color': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'type': 'STANDARD_COLOR'"
-"      }, {"
-"        'type': 'STANDARD_MONOCHROME'"
-"      }, {"
-"        'type': 'CUSTOM_MONOCHROME',"
-"        'vendor_id': '123',"
-"        'custom_display_name': 'monochrome'"
-"      } ]"
-"    },"
-"    'duplex': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'type': 'LONG_EDGE'"
-"       }, {"
-"        'type': 'SHORT_EDGE'"
-"       }, {"
-"        'type': 'NO_DUPLEX'"
-"       } ]"
-"    },"
-"    'page_orientation': {"
-"      'option': [ {"
-"        'type': 'PORTRAIT'"
-"      }, {"
-"        'type': 'LANDSCAPE'"
-"      }, {"
-"        'is_default': true,"
-"        'type': 'AUTO'"
-"      } ]"
-"    },"
-"    'copies': {"
-"    },"
-"    'margins': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'type': 'BORDERLESS',"
-"        'top_microns': 0,"
-"        'right_microns': 0,"
-"        'bottom_microns': 0,"
-"        'left_microns': 0"
-"      }, {"
-"         'type': 'STANDARD',"
-"         'top_microns': 100,"
-"         'right_microns': 200,"
-"         'bottom_microns': 300,"
-"         'left_microns': 400"
-"      }, {"
-"         'type': 'CUSTOM',"
-"         'top_microns': 1,"
-"         'right_microns': 2,"
-"         'bottom_microns': 3,"
-"         'left_microns': 4"
-"      } ]"
-"    },"
-"    'dpi': {"
-"      'option': [ {"
-"        'horizontal_dpi': 150,"
-"        'vertical_dpi': 250"
-"      }, {"
-"        'is_default': true,"
-"        'horizontal_dpi': 600,"
-"        'vertical_dpi': 1600"
-"      } ]"
-"    },"
-"    'fit_to_page': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'type': 'NO_FITTING'"
-"      }, {"
-"        'type': 'FIT_TO_PAGE'"
-"      }, {"
-"        'type': 'GROW_TO_PAGE'"
-"      }, {"
-"        'type': 'SHRINK_TO_PAGE'"
-"      }, {"
-"        'type': 'FILL_PAGE'"
-"      } ]"
-"    },"
-"    'page_range': {"
-"    },"
-"    'media_size': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'name': 'NA_LETTER',"
-"        'width_microns': 2222,"
-"        'height_microns': 3333"
-"      }, {"
-"        'name': 'ISO_A6',"
-"        'width_microns': 4444,"
-"        'height_microns': 5555"
-"      }, {"
-"        'name': 'JPN_YOU4',"
-"        'width_microns': 6666,"
-"        'height_microns': 7777"
-"      }, {"
-"        'width_microns': 1111,"
-"        'is_continuous_feed': true,"
-"        'custom_display_name': 'FEED'"
-"      } ]"
-"    },"
-"    'collate': {"
-"      'default': false"
-"    },"
-"    'reverse_order': {"
-"      'default': true"
-"    }"
-"  }"
-"}";
-
+    "{"
+    "  'version': '1.0',"
+    "  'printer': {"
+    "    'supported_content_type': [ {"
+    "      'content_type': 'image/pwg-raster'"
+    "    }, {"
+    "      'content_type': 'image/jpeg'"
+    "    } ],"
+    "    'pwg_raster_config' : {"
+    "      'document_sheet_back' : 'MANUAL_TUMBLE',"
+    "      'reverse_order_streaming': true"
+    "    },"
+    "    'color': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'type': 'STANDARD_COLOR'"
+    "      }, {"
+    "        'type': 'STANDARD_MONOCHROME'"
+    "      }, {"
+    "        'type': 'CUSTOM_MONOCHROME',"
+    "        'vendor_id': '123',"
+    "        'custom_display_name': 'monochrome'"
+    "      } ]"
+    "    },"
+    "    'duplex': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'type': 'LONG_EDGE'"
+    "       }, {"
+    "        'type': 'SHORT_EDGE'"
+    "       }, {"
+    "        'type': 'NO_DUPLEX'"
+    "       } ]"
+    "    },"
+    "    'page_orientation': {"
+    "      'option': [ {"
+    "        'type': 'PORTRAIT'"
+    "      }, {"
+    "        'type': 'LANDSCAPE'"
+    "      }, {"
+    "        'is_default': true,"
+    "        'type': 'AUTO'"
+    "      } ]"
+    "    },"
+    "    'copies': {"
+    "    },"
+    "    'margins': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'type': 'BORDERLESS',"
+    "        'top_microns': 0,"
+    "        'right_microns': 0,"
+    "        'bottom_microns': 0,"
+    "        'left_microns': 0"
+    "      }, {"
+    "         'type': 'STANDARD',"
+    "         'top_microns': 100,"
+    "         'right_microns': 200,"
+    "         'bottom_microns': 300,"
+    "         'left_microns': 400"
+    "      }, {"
+    "         'type': 'CUSTOM',"
+    "         'top_microns': 1,"
+    "         'right_microns': 2,"
+    "         'bottom_microns': 3,"
+    "         'left_microns': 4"
+    "      } ]"
+    "    },"
+    "    'dpi': {"
+    "      'option': [ {"
+    "        'horizontal_dpi': 150,"
+    "        'vertical_dpi': 250"
+    "      }, {"
+    "        'is_default': true,"
+    "        'horizontal_dpi': 600,"
+    "        'vertical_dpi': 1600"
+    "      } ]"
+    "    },"
+    "    'fit_to_page': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'type': 'NO_FITTING'"
+    "      }, {"
+    "        'type': 'FIT_TO_PAGE'"
+    "      }, {"
+    "        'type': 'GROW_TO_PAGE'"
+    "      }, {"
+    "        'type': 'SHRINK_TO_PAGE'"
+    "      }, {"
+    "        'type': 'FILL_PAGE'"
+    "      } ]"
+    "    },"
+    "    'page_range': {"
+    "    },"
+    "    'media_size': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'name': 'NA_LETTER',"
+    "        'width_microns': 2222,"
+    "        'height_microns': 3333"
+    "      }, {"
+    "        'name': 'ISO_A6',"
+    "        'width_microns': 4444,"
+    "        'height_microns': 5555"
+    "      }, {"
+    "        'name': 'JPN_YOU4',"
+    "        'width_microns': 6666,"
+    "        'height_microns': 7777"
+    "      }, {"
+    "        'width_microns': 1111,"
+    "        'is_continuous_feed': true,"
+    "        'custom_display_name': 'FEED'"
+    "      } ]"
+    "    },"
+    "    'collate': {"
+    "      'default': false"
+    "    },"
+    "    'reverse_order': {"
+    "      'default': true"
+    "    }"
+    "  }"
+    "}";
 
 const char kDefaultCdd[] =
-"{"
-"  'version': '1.0'"
-"}";
+    "{"
+    "  'version': '1.0'"
+    "}";
 
 const char kBadVersionCdd[] =
-"{"
-"  'version': '1.1',"
-"  'printer': {"
-"  }"
-"}";
+    "{"
+    "  'version': '1.1',"
+    "  'printer': {"
+    "  }"
+    "}";
 
 const char kNoDefaultCdd[] =
-"{"
-"  'version': '1.0',"
-"  'printer': {"
-"    'color': {"
-"      'option': [ {"
-"        'type': 'STANDARD_COLOR'"
-"      }, {"
-"        'type': 'STANDARD_MONOCHROME'"
-"      } ]"
-"    }"
-"  }"
-"}";
+    "{"
+    "  'version': '1.0',"
+    "  'printer': {"
+    "    'color': {"
+    "      'option': [ {"
+    "        'type': 'STANDARD_COLOR'"
+    "      }, {"
+    "        'type': 'STANDARD_MONOCHROME'"
+    "      } ]"
+    "    }"
+    "  }"
+    "}";
 
 const char kMultyDefaultCdd[] =
-"{"
-"  'version': '1.0',"
-"  'printer': {"
-"    'color': {"
-"      'option': [ {"
-"        'is_default': true,"
-"        'type': 'STANDARD_COLOR'"
-"      }, {"
-"        'is_default': true,"
-"        'type': 'STANDARD_MONOCHROME'"
-"      } ]"
-"    }"
-"  }"
-"}";
+    "{"
+    "  'version': '1.0',"
+    "  'printer': {"
+    "    'color': {"
+    "      'option': [ {"
+    "        'is_default': true,"
+    "        'type': 'STANDARD_COLOR'"
+    "      }, {"
+    "        'is_default': true,"
+    "        'type': 'STANDARD_MONOCHROME'"
+    "      } ]"
+    "    }"
+    "  }"
+    "}";
 
 const char kCjt[] =
-"{"
-"  'version': '1.0',"
-"  'print': {"
-"    'pwg_raster_config' : {"
-"      'document_sheet_back' : 'MANUAL_TUMBLE',"
-"      'reverse_order_streaming': true"
-"    },"
-"    'color': {"
-"      'type': 'STANDARD_MONOCHROME'"
-"    },"
-"    'duplex': {"
-"      'type': 'NO_DUPLEX'"
-"    },"
-"    'page_orientation': {"
-"      'type': 'LANDSCAPE'"
-"    },"
-"    'copies': {"
-"      'copies': 123"
-"    },"
-"    'margins': {"
-"       'type': 'CUSTOM',"
-"       'top_microns': 7,"
-"       'right_microns': 6,"
-"       'bottom_microns': 3,"
-"       'left_microns': 1"
-"    },"
-"    'dpi': {"
-"      'horizontal_dpi': 562,"
-"      'vertical_dpi': 125"
-"    },"
-"    'fit_to_page': {"
-"      'type': 'SHRINK_TO_PAGE'"
-"    },"
-"    'page_range': {"
-"      'interval': [ {"
-"        'start': 1,"
-"        'end': 99"
-"       }, {"
-"        'start': 150"
-"       } ]"
-"    },"
-"    'media_size': {"
-"      'name': 'ISO_C7C6',"
-"      'width_microns': 4261,"
-"      'height_microns': 334"
-"    },"
-"    'collate': {"
-"      'collate': false"
-"    },"
-"    'reverse_order': {"
-"      'reverse_order': true"
-"    }"
-"  }"
-"}";
+    "{"
+    "  'version': '1.0',"
+    "  'print': {"
+    "    'pwg_raster_config' : {"
+    "      'document_sheet_back' : 'MANUAL_TUMBLE',"
+    "      'reverse_order_streaming': true"
+    "    },"
+    "    'color': {"
+    "      'type': 'STANDARD_MONOCHROME'"
+    "    },"
+    "    'duplex': {"
+    "      'type': 'NO_DUPLEX'"
+    "    },"
+    "    'page_orientation': {"
+    "      'type': 'LANDSCAPE'"
+    "    },"
+    "    'copies': {"
+    "      'copies': 123"
+    "    },"
+    "    'margins': {"
+    "       'type': 'CUSTOM',"
+    "       'top_microns': 7,"
+    "       'right_microns': 6,"
+    "       'bottom_microns': 3,"
+    "       'left_microns': 1"
+    "    },"
+    "    'dpi': {"
+    "      'horizontal_dpi': 562,"
+    "      'vertical_dpi': 125"
+    "    },"
+    "    'fit_to_page': {"
+    "      'type': 'SHRINK_TO_PAGE'"
+    "    },"
+    "    'page_range': {"
+    "      'interval': [ {"
+    "        'start': 1,"
+    "        'end': 99"
+    "       }, {"
+    "        'start': 150"
+    "       } ]"
+    "    },"
+    "    'media_size': {"
+    "      'name': 'ISO_C7C6',"
+    "      'width_microns': 4261,"
+    "      'height_microns': 334"
+    "    },"
+    "    'collate': {"
+    "      'collate': false"
+    "    },"
+    "    'reverse_order': {"
+    "      'reverse_order': true"
+    "    }"
+    "  }"
+    "}";
 
 const char kDefaultCjt[] =
-"{"
-"  'version': '1.0'"
-"}";
+    "{"
+    "  'version': '1.0'"
+    "}";
 
 const char kBadVersionCjt[] =
-"{"
-"  'version': '1.1',"
-"  'print': {"
-"  }"
-"}";
+    "{"
+    "  'version': '1.1',"
+    "  'print': {"
+    "  }"
+    "}";
 
 TEST(PrinterDescriptionTest, CddInit) {
   CloudDeviceDescription description;
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index d57e96a..d9b67f8 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -64,7 +64,7 @@
             'autofill/core/common/form_field_data_unittest.cc',
             'autofill/core/common/password_form_fill_data_unittest.cc',
             'autofill/core/common/save_password_progress_logger_unittest.cc',
-            'cloud_devices/printer_description_unittest.cc',
+            'cloud_devices/common/printer_description_unittest.cc',
             'data_reduction_proxy/browser/data_reduction_proxy_metrics_unittest.cc',
             'data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc',
             'data_reduction_proxy/browser/http_auth_handler_data_reduction_proxy_unittest.cc',
@@ -189,7 +189,7 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
 
             # Dependencies of cloud_devices
-            'components.gyp:cloud_devices',
+            'components.gyp:cloud_devices_common',
 
             # Dependencies of data_reduction_proxy
             'components.gyp:data_reduction_proxy_browser',