Moving from from using WebFrame::name to WebFrame::uniqueName

content/shell/webkit_test_runner.cc

 // Copyright (c) 2012 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/webkit_test_runner.h"
 
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "content/public/renderer/render_view.h"
@@ skipping 37 matching lines @@
 std::string DumpFramesAsText(WebFrame* frame, bool printing, bool recursive) {
   std::string result;
 
   // Cannot do printed format for anything other than HTML.
   if (printing && !frame->document().isHTMLDocument())
     return std::string();
 
   // Add header for all but the main frame. Skip emtpy frames.
   if (frame->parent() && !frame->document().documentElement().isNull()) {
     result.append("\n--------\nFrame: '");
-    result.append(frame->name().utf8().data());
+    result.append(frame->uniqueName().utf8().data());
     result.append("'\n--------\n");
   }
 
   result.append(
       printing ? DumpDocumentPrintedText(frame) : DumpDocumentText(frame));
   result.append("\n");
 
   if (recursive) {
     for (WebFrame* child = frame->firstChild(); child;
          child = child->nextSibling()) {
       result.append(DumpFramesAsText(child, printing, recursive));
     }
   }
   return result;
 }
 
 std::string DumpFrameScrollPosition(WebFrame* frame, bool recursive) {
   std::string result;
 
   WebSize offset = frame->scrollOffset();
   if (offset.width > 0 || offset.height > 0) {
     if (frame->parent()) {
       result.append(
-          base::StringPrintf("frame '%s' ", frame->name().utf8().data()));
+          base::StringPrintf("frame '%s' ", frame->uniqueName().utf8().data()));
     }
     result.append(
         base::StringPrintf("scrolled to %d,%d\n", offset.width, offset.height));
   }
 
   if (recursive) {
     for (WebFrame* child = frame->firstChild(); child;
          child = child->nextSibling()) {
       result.append(DumpFrameScrollPosition(child, recursive));
     }
@@ skipping 118 matching lines @@
     SkBitmap empty_image;
     Send(new ShellViewHostMsg_ImageDump(
         routing_id(), actual_pixel_hash, empty_image));
     return;
   }
   Send(new ShellViewHostMsg_ImageDump(
       routing_id(), actual_pixel_hash, snapshot));
 }
 
 }  // namespace content