Do some refactoring of renderer_host....

chrome/browser/back_forward_menu_model_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 "chrome/browser/back_forward_menu_model.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile_manager.h"
-#include "chrome/browser/renderer_host/test_render_view_host.h"
+#include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class BackFwdMenuModelTest : public RenderViewHostTestHarness {
  public:
    void ValidateModel(BackForwardMenuModel* model, int history_items,
                       int chapter_stops) {
@@ skipping 374 matching lines @@
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(0, true));
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(1, true));
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(2, true));
   EXPECT_EQ(4, back_model->GetIndexOfNextChapterStop(3, true));
   // And try backwards as well.
   EXPECT_EQ(3, back_model->GetIndexOfNextChapterStop(4, false));
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(3, false));
   EXPECT_EQ(1, back_model->GetIndexOfNextChapterStop(2, false));
   EXPECT_EQ(-1, back_model->GetIndexOfNextChapterStop(1, false));
 }