Do some refactoring of renderer_host....

chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #include "app/app_paths.h"
 #include "base/path_service.h"
 #import "chrome/browser/cocoa/blocked_popup_container_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
-#include "chrome/browser/renderer_host/test_render_view_host.h"
+#include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace {
 const std::string host1 = "host1";
 }  // namespace
 
 class BlockedPopupContainerControllerTest : public RenderViewHostTestHarness {
  public:
@@ skipping 52 matching lines @@
   EXPECT_TRUE([cocoa_controller_ view]);
   EXPECT_TRUE([[cocoa_controller_ view] superview]);
   EXPECT_TRUE([[(NSTextField*)[cocoa_controller_ label]
                 stringValue] length] > 0);
 
   // Close the popup and verify it's no longer in the view hierarchy. This
   // means HideView() has been called.
   [cocoa_controller_ closePopup:nil];
   EXPECT_FALSE([[cocoa_controller_ view] superview]);
 }