Move unique name generation and tracking into //content.

third_party/WebKit/Source/core/page/FrameTree.h

Index: third_party/WebKit/Source/core/page/FrameTree.h
diff --git a/third_party/WebKit/Source/core/page/FrameTree.h b/third_party/WebKit/Source/core/page/FrameTree.h
index c69edeb7c73dca78581f0a80e8d8ef91d42ef4c9..e04ddc85660b46014aec797dc1adbc6b5dfa6cd8 100644
--- a/third_party/WebKit/Source/core/page/FrameTree.h
+++ b/third_party/WebKit/Source/core/page/FrameTree.h
@@ -39,20 +39,6 @@ class CORE_EXPORT FrameTree final {
   const AtomicString& name() const { return m_name; }
   void setName(const AtomicString&);
 
-  // Unique name of a frame (unique per page).  Mainly used to identify the
-  // frame for session history purposes, but also used in expected results
-  // of layout tests.
-  //
-  // The value should be treated as an unstructured, opaque string.
-  const AtomicString& uniqueName() const { return m_uniqueName; }
-
-  // Directly assigns both the name and uniqueName.  Can be used when
-  // |uniqueName| is already known (i.e. when it has been precalculated by
-  // calculateUniqueNameForNewChildFrame OR when replicating the name between
-  // LocalFrames and RemoteFrames for the same logical frame).
-  void setPrecalculatedName(const AtomicString& name,
-                            const AtomicString& uniqueName);
-
   Frame* parent() const;
   Frame* top() const;
   Frame* nextSibling() const;
@@ -71,47 +57,10 @@ class CORE_EXPORT FrameTree final {
 
   DECLARE_TRACE();
 
-  AtomicString calculateUniqueNameForNewChildFrame(
-      const AtomicString& name,
-      const AtomicString& fallbackName = nullAtom) const;
-
  private:
-  // Returns true if one of frames in the tree already has unique name equal
-  // to |uniqueNameCandidate|.
-  bool uniqueNameExists(const String& uniqueNameCandidate) const;
-
-  // Generates a hopefully-but-not-necessarily unique name based on frame's
-  // relative position in the tree and on unique names of ancestors.
-  String generateUniqueNameCandidate(bool existingChildFrame) const;
-
-  // Generates a hopefully-but-not-necessarily unique suffix based on |child|
-  // absolute position in the tree.  If |child| is nullptr, calculations are
-  // made for a position that a new child of |this| would have.
-  String generateFramePosition(Frame* child) const;
-
-  // Concatenates |prefix|, |likelyUniqueSuffix| (and additional, internally
-  // generated suffix) until the result is a unique name, that doesn't exist
-  // elsewhere in the frame tree.  Returns the unique name built in this way.
-  AtomicString appendUniqueSuffix(const String& prefix,
-                                  const String& likelyUniqueSuffix) const;
-
-  // Calculates a unique name for |child| frame (which might be nullptr if the
-  // child has not yet been created - i.e. when we need unique name for a new
-  // frame).  Tries to use the |assignedName| or |fallbackName| if possible,
-  // otherwise falls back to generating a deterministic,
-  // stable-across-page-reloads string based on |child| position in the tree.
-  AtomicString calculateUniqueNameForChildFrame(
-      Frame* child,
-      const AtomicString& assignedName,
-      const AtomicString& fallbackName = nullAtom) const;
-
-  // Sets |m_uniqueName| and asserts its uniqueness.
-  void setUniqueName(const AtomicString&);
-
   Member<Frame> m_thisFrame;
 
   AtomicString m_name;  // The actual frame name (may be empty).
-  AtomicString m_uniqueName;
 
   mutable unsigned m_scopedChildCount;
 };