Removing instances of profile_->GetBookmarkModel() as part of converting BookmarkModel to a PKS.

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

 // Copyright (c) 2011 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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 using bookmark_utils::GetTitleFromTreeIter;
 using content::BrowserThread;
 
 // Base class for bookmark editor tests. This class is a copy from
 // bookmark_editor_view_unittest.cc, and all the tests in this file are
 // GTK-ifications of the corresponding views tests. Testing here is really
 // important because on Linux, we make round trip copies from chrome's
 // BookmarkModel class to GTK's native GtkTreeStore.
 class BookmarkEditorGtkTest : public testing::Test {
  public:
   BookmarkEditorGtkTest()
       : model_(NULL),
         ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {
   }
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
 
-    model_ = profile_->GetBookmarkModel();
+    model_ = BookmarkModelFactory::GetForProfile(profile_.get());
 
     AddTestData();
   }
 
   virtual void TearDown() OVERRIDE {
   }
 
  protected:
   std::string base_path() const { return "file:///c:/tmp/"; }
 
@@ skipping 283 matching lines @@
   gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
 
   editor.ApplyEdits();
 
   const BookmarkNode* other_node = model_->other_node();
   ASSERT_EQ(2, other_node->child_count());
 
   const BookmarkNode* new_node = other_node->GetChild(0);
   EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
 }