Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(498)

Unified Diff: extensions/renderer/script_context_browsertest.cc

Issue 2714943004: Move unique name generation and tracking into //content. (Closed)
Patch Set: Rebase again. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/script_context_browsertest.cc
diff --git a/extensions/renderer/script_context_browsertest.cc b/extensions/renderer/script_context_browsertest.cc
index 4ee033f64fe804920fe5d176156656d22698ec25..8fc6595359acce9ba504ceb156ad40292be9120f 100644
--- a/extensions/renderer/script_context_browsertest.cc
+++ b/extensions/renderer/script_context_browsertest.cc
@@ -49,22 +49,22 @@ TEST_F(ScriptContextTest, GetEffectiveDocumentURL) {
WebFrame* frame1 = frame->firstChild();
ASSERT_TRUE(frame1);
- ASSERT_EQ("frame1", frame1->uniqueName());
+ ASSERT_EQ("frame1", frame1->assignedName());
WebFrame* frame1_1 = frame1->firstChild();
ASSERT_TRUE(frame1_1);
- ASSERT_EQ("frame1_1", frame1_1->uniqueName());
+ ASSERT_EQ("frame1_1", frame1_1->assignedName());
WebFrame* frame1_2 = frame1_1->nextSibling();
ASSERT_TRUE(frame1_2);
- ASSERT_EQ("frame1_2", frame1_2->uniqueName());
+ ASSERT_EQ("frame1_2", frame1_2->assignedName());
WebFrame* frame2 = frame1->nextSibling();
ASSERT_TRUE(frame2);
- ASSERT_EQ("frame2", frame2->uniqueName());
+ ASSERT_EQ("frame2", frame2->assignedName());
WebFrame* frame2_1 = frame2->firstChild();
ASSERT_TRUE(frame2_1);
- ASSERT_EQ("frame2_1", frame2_1->uniqueName());
+ ASSERT_EQ("frame2_1", frame2_1->assignedName());
WebFrame* frame3 = frame2->nextSibling();
ASSERT_TRUE(frame3);
- ASSERT_EQ("frame3", frame3->uniqueName());
+ ASSERT_EQ("frame3", frame3->assignedName());
// Load a blank document in a frame from a different origin.
frame3->loadHTMLString(frame3_html, different_url);
@@ -72,7 +72,7 @@ TEST_F(ScriptContextTest, GetEffectiveDocumentURL) {
WebFrame* frame3_1 = frame3->firstChild();
ASSERT_TRUE(frame3_1);
- ASSERT_EQ("frame3_1", frame3_1->uniqueName());
+ ASSERT_EQ("frame3_1", frame3_1->assignedName());
// Top-level frame
EXPECT_EQ(GetEffectiveDocumentURL(frame), top_url);
« no previous file with comments | « content/test/test_runner_support.cc ('k') | third_party/WebKit/LayoutTests/fast/history/frameset-repeated-name.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698