Move unique name generation and tracking into //content.

content/shell/test_runner/layout_dump.cc

 // Copyright 2016 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 "content/shell/test_runner/layout_dump.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "content/renderer/render_frame_impl.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace test_runner {
 
 using blink::WebFrame;
 using blink::WebFrameContentDumper;
 using blink::WebLocalFrame;
 using blink::WebSize;
 
 namespace {
 
-std::string DumpFrameHeaderIfNeeded(WebFrame* frame) {
+std::string DumpFrameHeaderIfNeeded(WebLocalFrame* frame) {
   std::string result;
 
   // Add header for all but the main frame. Skip empty frames.
   if (frame->parent() && !frame->document().documentElement().isNull()) {
     result.append("\n--------\nFrame: '");
-    result.append(frame->uniqueName().utf8());
+    result.append(content::RenderFrameImpl::FromWebFrame(frame)->unique_name());
     result.append("'\n--------\n");
   }
 
   return result;
 }
 
-std::string DumpFrameScrollPosition(WebFrame* frame) {
+std::string DumpFrameScrollPosition(WebLocalFrame* frame) {
   std::string result;
   WebSize offset = frame->getScrollOffset();
   if (offset.width > 0 || offset.height > 0) {
     if (frame->parent()) {
-      result =
-          std::string("frame '") + frame->uniqueName().utf8().data() + "' ";
+      result = std::string("frame '") +
+               content::RenderFrameImpl::FromWebFrame(frame)->unique_name() +
+               "' ";
     }
     base::StringAppendF(&result, "scrolled to %d,%d\n", offset.width,
                         offset.height);
   }
 
   return result;
 }
 
 }  // namespace
 
@@ skipping 27 matching lines @@
                                                            layout_text_behavior)
                    .utf8();
     }
     result += DumpFrameScrollPosition(frame);
   }
 
   return result;
 }
 
 }  // namespace test_runner