Move more files from chrome/test to chrome/test/base, part #2

chrome/test/base/model_test_utils.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 "chrome/test/model_test_utils.h"
+#include "chrome/test/base/model_test_utils.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "googleurl/src/gurl.h"
 
 namespace model_test_utils {
 
 std::string ModelStringFromNode(const BookmarkNode* node) {
   // Since the children of the node are not available as a vector,
   // we'll just have to do it the hard way.
@@ skipping 59 matching lines @@
                              const std::string& model_string) {
   DCHECK(node);
   const std::string folder_tell(":[");
   std::string::size_type start_pos = 0;
   std::string::size_type end_pos =
       AddNodesFromString(model, node, model_string, start_pos);
   DCHECK(end_pos == std::string::npos);
 }
 
 }  // namespace model_test_utils