Get rid of BookmarkEditor::Show()'s BookmarkEditor::Handler argument.

chrome/browser/gtk/bookmark_editor_gtk_unittest.cc

 // Copyright (c) 2006-2008 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 <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/gtk/bookmark_editor_gtk.h"
@@ skipping 79 matching lines @@
     const BookmarkNode* of1 =
         model_->AddGroup(model_->other_node(), 1, L"OF1");
     model_->AddURL(of1, 0, L"of1a", GURL(test_base + "of1a"));
   }
 };
 
 // Makes sure the tree model matches that of the bookmark bar model.
 TEST_F(BookmarkEditorGtkTest, ModelsMatch) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
 
   // The root should have two children, one for the bookmark bar node,
   // the other for the 'other bookmarks' folder.
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   GtkTreeIter toplevel;
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &toplevel));
   GtkTreeIter bookmark_bar_node = toplevel;
   ASSERT_TRUE(gtk_tree_model_iter_next(store, &toplevel));
   GtkTreeIter other_node = toplevel;
   ASSERT_FALSE(gtk_tree_model_iter_next(store, &toplevel));
@@ skipping 19 matching lines @@
   ASSERT_EQ(1, gtk_tree_model_iter_n_children(store, &other_node));
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &child, &other_node));
   ASSERT_EQ(L"OF1", GetTitleFromTreeIter(store, &child));
   ASSERT_FALSE(gtk_tree_model_iter_next(store, &child));
 }
 
 // Changes the title and makes sure parent/visual order doesn't change.
 TEST_F(BookmarkEditorGtkTest, EditTitleKeepsPosition) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(GetNode("a")),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
   GtkTreeIter bookmark_bar_node;
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &bookmark_bar_node));
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
       profile_->GetBookmarkModel()->GetBookmarkBarNode();
   ASSERT_EQ(L"new_a", bb_node->GetChild(0)->GetTitle());
   // The URL shouldn't have changed.
   ASSERT_TRUE(GURL(base_path() + "a") == bb_node->GetChild(0)->GetURL());
 }
 
 // Changes the url and makes sure parent/visual order doesn't change.
 TEST_F(BookmarkEditorGtkTest, EditURLKeepsPosition) {
   Time node_time = GetNode("a")->date_added();
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(GetNode("a")),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
                      GURL(base_path() + "new_a").spec().c_str());
 
   GtkTreeIter bookmark_bar_node;
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &bookmark_bar_node));
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
       profile_->GetBookmarkModel()->GetBookmarkBarNode();
   ASSERT_EQ(L"a", bb_node->GetChild(0)->GetTitle());
   // The URL should have changed.
   ASSERT_TRUE(GURL(base_path() + "new_a") == bb_node->GetChild(0)->GetURL());
   ASSERT_TRUE(node_time == bb_node->GetChild(0)->date_added());
 }
 
 // Moves 'a' to be a child of the other node.
 TEST_F(BookmarkEditorGtkTest, ChangeParent) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(GetNode("a")),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
 
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   GtkTreeIter gtk_other_node;
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &gtk_other_node));
   ASSERT_TRUE(gtk_tree_model_iter_next(store, &gtk_other_node));
   editor.ApplyEdits(&gtk_other_node);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
   ASSERT_EQ(L"a", other_node->GetChild(2)->GetTitle());
   ASSERT_TRUE(GURL(base_path() + "a") == other_node->GetChild(2)->GetURL());
 }
 
 // Moves 'a' to be a child of the other node.
 // Moves 'a' to be a child of the other node and changes its url to new_a.
 TEST_F(BookmarkEditorGtkTest, ChangeParentAndURL) {
   Time node_time = GetNode("a")->date_added();
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(GetNode("a")),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
                      GURL(base_path() + "new_a").spec().c_str());
 
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   GtkTreeIter gtk_other_node;
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &gtk_other_node));
   ASSERT_TRUE(gtk_tree_model_iter_next(store, &gtk_other_node));
   editor.ApplyEdits(&gtk_other_node);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
   ASSERT_EQ(L"a", other_node->GetChild(2)->GetTitle());
   ASSERT_TRUE(GURL(base_path() + "new_a") == other_node->GetChild(2)->GetURL());
   ASSERT_TRUE(node_time == other_node->GetChild(2)->date_added());
 }
 
 // Creates a new folder and moves a node to it.
 TEST_F(BookmarkEditorGtkTest, MoveToNewParent) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(GetNode("a")),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
 
   GtkTreeIter bookmark_bar_node;
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &bookmark_bar_node));
 
   // The bookmark bar should have 2 nodes: folder F1 and F2.
   GtkTreeIter f2_iter;
   ASSERT_EQ(2, gtk_tree_model_iter_n_children(store, &bookmark_bar_node));
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &f2_iter,
                                            &bookmark_bar_node));
@@ skipping 27 matching lines @@
   // F21 should have one child, F211.
   const BookmarkNode* mf21 = mf2->GetChild(0);
   ASSERT_EQ(1, mf21->GetChildCount());
   ASSERT_EQ(L"F211", mf21->GetChild(0)->GetTitle());
 }
 
 // Brings up the editor, creating a new URL on the bookmark bar.
 TEST_F(BookmarkEditorGtkTest, NewURL) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(),
-                           BookmarkEditor::SHOW_TREE, NULL);
+                           BookmarkEditor::SHOW_TREE);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
                      GURL(base_path() + "a").spec().c_str());
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
   GtkTreeIter bookmark_bar_node;
   GtkTreeModel* store = GTK_TREE_MODEL(editor.tree_store_);
   ASSERT_TRUE(gtk_tree_model_get_iter_first(store, &bookmark_bar_node));
   editor.ApplyEdits(&bookmark_bar_node);
 
   const BookmarkNode* bb_node =
       profile_->GetBookmarkModel()->GetBookmarkBarNode();
   ASSERT_EQ(4, bb_node->GetChildCount());
 
   const BookmarkNode* new_node = bb_node->GetChild(3);
   EXPECT_EQ(L"new_a", new_node->GetTitle());
   EXPECT_TRUE(GURL(base_path() + "a") == new_node->GetURL());
 }
 
 // Brings up the editor with no tree and modifies the url.
 TEST_F(BookmarkEditorGtkTest, ChangeURLNoTree) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(
                                model_->other_node()->GetChild(0)),
-                           BookmarkEditor::NO_TREE, NULL);
+                           BookmarkEditor::NO_TREE);
 
   gtk_entry_set_text(GTK_ENTRY(editor.url_entry_),
                      GURL(base_path() + "a").spec().c_str());
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
   editor.ApplyEdits(NULL);
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
   ASSERT_EQ(2, other_node->GetChildCount());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
 
   EXPECT_EQ(L"new_a", new_node->GetTitle());
   EXPECT_TRUE(GURL(base_path() + "a") == new_node->GetURL());
 }
 
 // Brings up the editor with no tree and modifies only the title.
 TEST_F(BookmarkEditorGtkTest, ChangeTitleNoTree) {
   BookmarkEditorGtk editor(NULL, profile_.get(), NULL,
                            BookmarkEditor::EditDetails(
                                model_->other_node()->GetChild(0)),
-                           BookmarkEditor::NO_TREE, NULL);
+                           BookmarkEditor::NO_TREE);
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
   editor.ApplyEdits();
 
   const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
   ASSERT_EQ(2, other_node->GetChildCount());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
   EXPECT_EQ(L"new_a", new_node->GetTitle());
 }