bookmarks: Cleanup, remove BookmarkModelTestUtils class.

chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_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 "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/bookmarks/bookmark_model_test_utils.h"
+#include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 
 @implementation FakeAppDelegate
 
 @synthesize test = test_;
 
 - (Profile*)lastProfile {
   if (!test_)
     return NULL;
   return test_->profile();
 }
@@ skipping 39 matching lines @@
   CocoaProfileTest::SetUp();
   ASSERT_TRUE(profile());
 
   appDelegate_.reset([[FakeAppDelegate alloc] init]);
   [appDelegate_.get() setTest:this];
   DCHECK([NSApp delegate] == nil);
   [NSApp setDelegate:appDelegate_];
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   const BookmarkNode* root = model->bookmark_bar_node();
   const std::string modelString("a f1:[ b d c ] d f2:[ e f g ] h ");
-  BookmarkModelTestUtils::AddNodesFromModelString(model, root, modelString);
+  test::AddNodesFromModelString(model, root, modelString);
   bookmarkBar_.reset([[BookmarkFolderAppleScript alloc]
       initWithBookmarkNode:model->bookmark_bar_node()]);
 }