gtk/bookmarks: Reuse |model_| in BookmarkBarGtkUnittest.

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc

Index: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index a48f5878125ff56d69bc0d4e7633611864373dda..765a94fcb6acb34e73f2a4cb940e399b349b8312 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 
+#include "base/compiler_specific.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -31,18 +32,20 @@ class BookmarkBarGtkUnittest : public testing::Test {
         file_thread_(BrowserThread::FILE, &message_loop_) {
   }
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
     browser_.reset(new Browser(Browser::TYPE_TABBED, profile_.get()));
 
+    model_ = profile_->GetBookmarkModel();
+
     origin_provider_.reset(new EmptyTabstripOriginProvider);
     bookmark_bar_.reset(new BookmarkBarGtk(NULL, browser_.get(),
                                            origin_provider_.get()));
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     message_loop_.RunAllPending();
 
     bookmark_bar_.reset();
@@ -51,6 +54,11 @@ class BookmarkBarGtkUnittest : public testing::Test {
     profile_.reset();
   }
 
+ protected:
+  BookmarkModel* model_;
+  scoped_ptr<BookmarkBarGtk> bookmark_bar_;

[Elliot Glaysher, 2011/11/15 17:55:59]

If you're going to make this protected, violate the style guidelines and put
this under |origin_provider_|. Moving this changes semantics.

[tfarina, 2011/11/15 20:56:26]

Done.

+
+ private:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
@@ -58,12 +66,10 @@ class BookmarkBarGtkUnittest : public testing::Test {
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<Browser> browser_;
   scoped_ptr<TabstripOriginProvider> origin_provider_;
-  scoped_ptr<BookmarkBarGtk> bookmark_bar_;
 };
 
 TEST_F(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty) {
-  BookmarkModel* model = profile_->GetBookmarkModel();
-  bookmark_bar_->Loaded(model, false);
+  bookmark_bar_->Loaded(model_, false);
 
   // There are no bookmarks in the model by default. Expect that the
   // |instructions_label| is shown.
@@ -71,26 +77,22 @@ TEST_F(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty) {
 }
 
 TEST_F(BookmarkBarGtkUnittest, HidesHelpMessageWithBookmark) {
-  BookmarkModel* model = profile_->GetBookmarkModel();
-
-  const BookmarkNode* parent = model->bookmark_bar_node();
-  model->AddURL(parent, parent->child_count(),
-                ASCIIToUTF16("title"), GURL("http://one.com"));
+  const BookmarkNode* parent = model_->bookmark_bar_node();
+  model_->AddURL(parent, parent->child_count(),
+                 ASCIIToUTF16("title"), GURL("http://one.com"));
 
-  bookmark_bar_->Loaded(model, false);
+  bookmark_bar_->Loaded(model_, false);
   EXPECT_FALSE(bookmark_bar_->show_instructions_);
 }
 
 TEST_F(BookmarkBarGtkUnittest, BuildsButtons) {
-  BookmarkModel* model = profile_->GetBookmarkModel();
-
-  const BookmarkNode* parent = model->bookmark_bar_node();
-  model->AddURL(parent, parent->child_count(),
-                ASCIIToUTF16("title"), GURL("http://one.com"));
-  model->AddURL(parent, parent->child_count(),
-                ASCIIToUTF16("other"), GURL("http://two.com"));
+  const BookmarkNode* parent = model_->bookmark_bar_node();
+  model_->AddURL(parent, parent->child_count(),
+                 ASCIIToUTF16("title"), GURL("http://one.com"));
+  model_->AddURL(parent, parent->child_count(),
+                 ASCIIToUTF16("other"), GURL("http://two.com"));
 
-  bookmark_bar_->Loaded(model, false);
+  bookmark_bar_->Loaded(model_, false);
 
   // We should expect two children to the bookmark bar's toolbar.
   GList* children = gtk_container_get_children(