Prevent interpretating userinfo as url scheme when editing bookmarks

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 241 matching lines @@
 };
 
 TEST_F(BookmarkEditorControllerUtf8NodeTest, DisplayUtf8Name) {
   // The "http://" prefix is trimmed, but the UTF-8 formatted characters remain.
   EXPECT_NSEQ([NSString stringWithCString:"www.foobar.com/心得寫作"
                                  encoding:NSUTF8StringEncoding],
               [controller_ displayURL]);
   [controller_ cancel:nil];
 }
 
+using BookmarkEditorControllerEditKeepsSchemeTest = CocoaProfileTest;
+TEST_F(BookmarkEditorControllerEditKeepsSchemeTest, EditKeepsScheme) {
+  // Edits the bookmark and ensures resulting URL keeps the same scheme, even
+  // when userinfo is present in the URL
+  ASSERT_TRUE(profile());
+
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
+  const BookmarkNode* kParent = model->bookmark_bar_node();
+  const base::string16 kTitle = ASCIIToUTF16("EditingKeepsScheme");
+
+  const GURL kUrl = GURL("http://javascript:scripttext@example.com/");
+  const BookmarkNode* kNode = model->AddURL(kParent, 0, base::string16(), kUrl);
+
+  BookmarkEditorController* controller = [[BookmarkEditorController alloc]
+      initWithParentWindow:test_window()
+                   profile:profile()
+                    parent:kParent
+                      node:kNode
+                       url:GURL()
+                     title:base::string16()
+             configuration:BookmarkEditor::SHOW_TREE];
+
+  [controller runAsModalSheet];
+
+  // We expect only the trailing / to be trimmed when userinfo is present
+  EXPECT_NSEQ(base::SysUTF8ToNSString(kUrl.spec()),
+              [[controller displayURL] stringByAppendingString:@"/"]);
+
+  [controller setDisplayName:base::SysUTF16ToNSString(kTitle)];
+
+  EXPECT_TRUE([controller okButtonEnabled]);
+  [controller ok:nil];
+
+  ASSERT_EQ(kParent->child_count(), 1);

[sky, 2016/09/29 22:20:54]

Over of assertions is expected, actual. 1 should be first. Same comment for the
remaining assertions.

[elawrence, 2016/09/30 15:50:08]

Done.

+  const BookmarkNode* kChild = kParent->GetChild(0);
+  EXPECT_EQ(kChild->GetTitle(), kTitle);
+  EXPECT_EQ(kChild->url(), kUrl);
+
+  controller = NULL;
+}
+
 class BookmarkEditorControllerTreeTest : public CocoaProfileTest {
 
  public:
   BookmarkEditorController* controller_;
   const BookmarkNode* folder_a_;
   const BookmarkNode* folder_b_;
   const BookmarkNode* folder_bb_;
   const BookmarkNode* folder_c_;
   const BookmarkNode* bookmark_bb_3_;
   GURL bb3_url_1_;
@@ skipping 208 matching lines @@
 
 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [controller_ setDisplayName:@"NEW BOOKMARK"];
   [controller_ setDisplayURL:@"http://NEWURL.com"];
   [controller_ ok:nil];
   const BookmarkNode* new_node = folder_bb_->GetChild(5);
   ASSERT_EQ(0, new_node->child_count());
   EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK"));
   EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com"));
 }