Move unique name generation and tracking into //content.

third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 82 matching lines @@
 TestWebWidgetClient* defaultWebWidgetClient() {
   DEFINE_STATIC_LOCAL(TestWebWidgetClient, client, ());
   return &client;
 }
 
 TestWebViewClient* defaultWebViewClient() {
   DEFINE_STATIC_LOCAL(TestWebViewClient, client, ());
   return &client;
 }
 
-// |uniqueName| is normally calculated in a somewhat complicated way by the
-// FrameTree class, but for test purposes the approximation below should be
-// close enough.
-String nameToUniqueName(const String& name) {
-  static int uniqueNameCounter = 0;
-  StringBuilder uniqueName;
-  uniqueName.append(name);
-  uniqueName.append(' ');
-  uniqueName.appendNumber(uniqueNameCounter++);
-  return uniqueName.toString();
-}
-
 }  // namespace
 
 void loadFrame(WebFrame* frame, const std::string& url) {
   WebURLRequest urlRequest(URLTestHelpers::toKURL(url));
   frame->loadRequest(urlRequest);
   pumpPendingRequestsForFrameToLoad(frame);
 }
 
 void loadHTMLString(WebFrame* frame,
                     const std::string& html,
@@ skipping 44 matching lines @@
 WebLocalFrameImpl* createLocalChild(WebRemoteFrame* parent,
                                     const WebString& name,
                                     WebFrameClient* client,
                                     WebWidgetClient* widgetClient,
                                     WebFrame* previousSibling,
                                     const WebFrameOwnerProperties& properties) {
   if (!client)
     client = defaultWebFrameClient();
 
   WebLocalFrameImpl* frame = toWebLocalFrameImpl(parent->createLocalChild(
-      WebTreeScopeType::Document, name, nameToUniqueName(name),
-      WebSandboxFlags::None, client,
+      WebTreeScopeType::Document, name, WebSandboxFlags::None, client,
       static_cast<TestWebFrameClient*>(client)->interfaceProvider(), nullptr,
       previousSibling, properties, nullptr));
 
   if (!widgetClient)
     widgetClient = defaultWebWidgetClient();
   WebFrameWidget::create(widgetClient, frame);
 
   return frame;
 }
 
 WebRemoteFrameImpl* createRemoteChild(WebRemoteFrame* parent,
                                       WebRemoteFrameClient* client,
                                       const WebString& name) {
-  return toWebRemoteFrameImpl(parent->createRemoteChild(
-      WebTreeScopeType::Document, name, nameToUniqueName(name),
-      WebSandboxFlags::None, client, nullptr));
+  return toWebRemoteFrameImpl(
+      parent->createRemoteChild(WebTreeScopeType::Document, name,
+                                WebSandboxFlags::None, client, nullptr));
 }
 
 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider)
     : m_webView(nullptr), m_settingOverrider(settingOverrider) {}
 
 WebViewHelper::~WebViewHelper() {
   reset();
 }
 
 WebViewImpl* WebViewHelper::initializeWithOpener(
@@ skipping 102 matching lines @@
   if (frame->frameWidget())
     frame->frameWidget()->close();
 
   frame->close();
 }
 
 WebLocalFrame* TestWebFrameClient::createChildFrame(
     WebLocalFrame* parent,
     WebTreeScopeType scope,
     const WebString& name,
-    const WebString& uniqueName,
+    const WebString& fallbackName,
     WebSandboxFlags sandboxFlags,
     const WebFrameOwnerProperties& frameOwnerProperties) {
   WebLocalFrame* frame =
       WebLocalFrame::create(scope, this, interfaceProvider(), nullptr);
   parent->appendChild(frame);
   return frame;
 }
 
 void TestWebFrameClient::didStartLoading(bool) {
   ++m_loadsInProgress;
@@ skipping 33 matching lines @@
   m_testWebViewClient->scheduleAnimation();
 }
 
 void TestWebViewWidgetClient::didMeaningfulLayout(
     WebMeaningfulLayout layoutType) {
   m_testWebViewClient->didMeaningfulLayout(layoutType);
 }
 
 }  // namespace FrameTestHelpers
 }  // namespace blink