Refactor JSONValueConverter Out of DisplayLayout

ash/display/display_layout.h

 // Copyright (c) 2013 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.
 
 #ifndef ASH_DISPLAY_DISPLAY_LAYOUT_H_
 #define ASH_DISPLAY_DISPLAY_LAYOUT_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-
-namespace gfx {
-class Display;
-}
+#include "base/strings/string_piece.h"
 
 namespace base {
 class Value;
 template <typename T> class JSONValueConverter;
 }
 
+namespace gfx {
+class Display;
+}
+
 namespace ash {
 
 // An identifier used to manage display layout in DisplayManager /
 // DisplayLayoutStore.
 using DisplayIdList = std::vector<int64_t>;
 
 using DisplayList = std::vector<gfx::Display>;
 
 // DisplayPlacement specifies where the display (D) is placed relative
 // to parent (P) display.  In the following example, the display (D)
@@ skipping 24 matching lines @@
   int offset;
 
   explicit DisplayPlacement(const DisplayPlacement& placement);
   DisplayPlacement(Position position, int offset);
   DisplayPlacement();
 
   DisplayPlacement& Swap();
 
   std::string ToString() const;
 
-  // Used by JSONValueConverter to generate DisplayPlacement from a
-  // JSON value.  See json_value_converter.h.
-  static void RegisterJSONConverter(
-      base::JSONValueConverter<DisplayPlacement>* converter);
+  static std::string PositionToString(Position position);
+  static bool StringToPosition(const base::StringPiece& string,
+                               Position* position);
 };
 
 class ASH_EXPORT DisplayLayout final {
  public:
   DisplayLayout();
   ~DisplayLayout();
 
-  // Converter functions to/from base::Value.
-  static bool ConvertFromValue(const base::Value& value, DisplayLayout* layout);
-  static bool ConvertToValue(const DisplayLayout& layout, base::Value* value);
-
-  // Used by JSONValueConverter to generate DisplayLayout from a
-  // JSON value.  See json_value_converter.h.
-  static void RegisterJSONConverter(
-      base::JSONValueConverter<DisplayLayout>* converter);
-
   // Validates the layout object.
   static bool Validate(const DisplayIdList& list, const DisplayLayout& layout);
 
   ScopedVector<DisplayPlacement> placement_list;
 
   // True if displays are mirrored.
   bool mirrored;
 
   // True if multi displays should default to unified mode.
   bool default_unified;
@@ skipping 14 matching lines @@
   // |display_id| if it exists, otherwise returns nullptr.
   const DisplayPlacement* FindPlacementById(int64_t display_id) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DisplayLayout);
 };
 
 }  // namespace ash
 
 #endif