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

webkit/glue/webkit_glue.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 "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 101 matching lines @@
   return document_element.innerText();
 }
 
 string16 DumpFramesAsText(WebFrame* web_frame, bool recursive) {
   string16 result;
 
   // Add header for all but the main frame. Skip empty frames.
   if (web_frame->parent() &&
       !web_frame->document().documentElement().isNull()) {
     result.append(ASCIIToUTF16("\n--------\nFrame: '"));
-    result.append(web_frame->name());
+    result.append(web_frame->uniqueName());
     result.append(ASCIIToUTF16("'\n--------\n"));
   }
 
   result.append(DumpDocumentText(web_frame));
   result.append(ASCIIToUTF16("\n"));
 
   if (recursive) {
     WebFrame* child = web_frame->firstChild();
     for (; child; child = child->nextSibling())
       result.append(DumpFramesAsText(child, recursive));
@@ skipping 22 matching lines @@
   return number_of_pages;
 }
 
 string16 DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) {
   gfx::Size offset = web_frame->scrollOffset();
   std::string result_utf8;
 
   if (offset.width() > 0 || offset.height() > 0) {
     if (web_frame->parent()) {
       base::StringAppendF(&result_utf8, "frame '%s' ",
-                          UTF16ToUTF8(web_frame->name()).c_str());
+                          UTF16ToUTF8(web_frame->uniqueName()).c_str());
     }
     base::StringAppendF(&result_utf8, "scrolled to %d,%d\n",
                         offset.width(), offset.height());
   }
 
   string16 result = UTF8ToUTF16(result_utf8);
 
   if (recursive) {
     WebFrame* child = web_frame->firstChild();
     for (; child; child = child->nextSibling())
@@ skipping 314 matching lines @@
     case WebKit::WebReferrerPolicyOrigin:
       net_referrer_policy = net::URLRequest::NEVER_CLEAR_REFERRER;
       break;
   }
   request->set_referrer_policy(net_referrer_policy);
 }
 
 COMPILE_ASSERT(std::numeric_limits<double>::has_quiet_NaN, has_quiet_NaN);
 
 } // namespace webkit_glue