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

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 714 matching lines @@
   error.reason = net::ERR_ABORTED;
   error.unreachableURL = request.url();
   return error;
 }
 
 void TestWebViewDelegate::unableToImplementPolicyWithError(
     WebFrame* frame, const WebURLError& error) {
   std::string domain = error.domain.utf8();
   printf("Policy delegate: unable to implement policy with error domain '%s', "
       "error code %d, in frame '%s'\n",
-      domain.data(), error.reason, frame->name().utf8().data());
+      domain.data(), error.reason, frame->uniqueName().utf8().data());
 }
 
 void TestWebViewDelegate::willPerformClientRedirect(
     WebFrame* frame, const WebURL& from, const WebURL& to,
     double interval, double fire_time) {
 }
 
 void TestWebViewDelegate::didCancelClientRedirect(WebFrame* frame) {
 }
 
@@ skipping 364 matching lines @@
 
   const WebHistoryItem& history_item =
       shell_->webView()->mainFrame()->previousHistoryItem();
   if (history_item.isNull())
     return;
 
   entry->SetContentState(webkit_glue::HistoryItemToString(history_item));
 }
 
 string16 TestWebViewDelegate::GetFrameDescription(WebFrame* webframe) {
-  std::string name = UTF16ToUTF8(webframe->name());
+  std::string name = UTF16ToUTF8(webframe->uniqueName());
 
   if (webframe == shell_->webView()->mainFrame()) {
     if (name.length())
       name = "main frame \"" + name + "\"";
     else
       name = "main frame";
   } else {
     if (name.length())
       name = "frame \"" + name + "\"";
     else
       name = "frame (anonymous)";
   }
   return UTF8ToUTF16(name);
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }