Update several browser_tests / content_browsertests to set iframes' name

content/browser/frame_host/frame_tree_browsertest.cc

 // Copyright 2014 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/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 65 matching lines @@
   ASSERT_EQ(3UL, root->child_count());
   EXPECT_EQ(std::string(), root->frame_name());
 
   ASSERT_EQ(2UL, root->child_at(0)->child_count());
   EXPECT_STREQ("1-1-name", root->child_at(0)->frame_name().c_str());
 
   // Verify the deepest node exists and has the right name.
   ASSERT_EQ(2UL, root->child_at(2)->child_count());
   EXPECT_EQ(1UL, root->child_at(2)->child_at(1)->child_count());
   EXPECT_EQ(0UL, root->child_at(2)->child_at(1)->child_at(0)->child_count());
-  EXPECT_STREQ("3-1-id",
+  EXPECT_STREQ("3-1-name",
       root->child_at(2)->child_at(1)->child_at(0)->frame_name().c_str());
 
   // Navigate to about:blank, which should leave only the root node of the frame
   // tree in the browser process.
   NavigateToURL(shell(), test_server()->GetURL("files/title1.html"));
 
   root = wc->GetFrameTree()->root();
   EXPECT_EQ(0UL, root->child_count());
   EXPECT_EQ(std::string(), root->frame_name());
 }
@@ skipping 52 matching lines @@
   // wait for the previous navigation to stop.
   TestNavigationObserver tab_observer(wc, 1);
   shell()->LoadURL(base_url.Resolve("blank.html"));
   tab_observer.Wait();
 
   // The frame tree should now be cleared.
   EXPECT_EQ(0UL, root->child_count());
 }
 
 }  // namespace content