Get rid of browser::FindLastActiveWithProfile call when adding a new bookmark and instead just pass the URL/title along.

BUG=129187
Review URL: https://chromiumcodereview.appspot.com/10656002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143719 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 5 deletions

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index ce5bda4..9a4a615 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
@@ -111,10 +111,15 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) {
       int index;
       const BookmarkNode* parent =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
+      GURL url;
+      string16 title;
+      bookmark_utils::GetURLAndTitleToBookmark(
+          browser_->GetActiveWebContents(), &url, &title);
       BookmarkEditor::Show(
           parent_widget_->GetNativeWindow(),
           profile_,
-          BookmarkEditor::EditDetails::AddNodeInFolder(parent, index),
+          BookmarkEditor::EditDetails::AddNodeInFolder(
+              parent, index, url, title),
           BookmarkEditor::SHOW_TREE);
       break;
     }
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index 1701ee3..f1b85c4 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -303,8 +303,8 @@ void BookmarkEditorView::Init() {
   } else if (details_.type == EditDetails::NEW_FOLDER) {
     title = l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME);
   } else if (details_.type == EditDetails::NEW_URL) {
-    bookmark_utils::GetURLAndTitleToBookmarkFromCurrentTab(profile_,
-        &url, &title);
+    url = details_.url;
+    title = details_.title;
   }
   title_tf_ = new views::Textfield;
   title_tf_->SetText(title);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 45a42c7..0fd58ce 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -132,7 +132,8 @@ class BookmarkEditorViewTest : public testing::Test {
 // Makes sure the tree model matches that of the bookmark bar model.
 TEST_F(BookmarkEditorViewTest, ModelsMatch) {
   CreateEditor(profile_.get(), NULL,
-               BookmarkEditor::EditDetails::AddNodeInFolder(NULL, -1),
+               BookmarkEditor::EditDetails::AddNodeInFolder(
+                   NULL, -1, GURL(), string16()),
                BookmarkEditorView::SHOW_TREE);
   BookmarkEditorView::EditorNode* editor_root = editor_tree_model()->GetRoot();
   // The root should have two or three children: bookmark bar, other bookmarks
@@ -263,7 +264,8 @@ TEST_F(BookmarkEditorViewTest, MoveToNewParent) {
 // Brings up the editor, creating a new URL on the bookmark bar.
 TEST_F(BookmarkEditorViewTest, NewURL) {
   CreateEditor(profile_.get(), NULL,
-               BookmarkEditor::EditDetails::AddNodeInFolder(NULL, -1),
+               BookmarkEditor::EditDetails::AddNodeInFolder(
+                   NULL, -1, GURL(), string16()),
                BookmarkEditorView::SHOW_TREE);
 
   SetURLText(UTF8ToWide(GURL(base_path() + "a").spec()));