Do some refactoring of renderer_host....

chrome/browser/blocked_popup_container_unittest.cc

 // 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.
 
 // Tests the cross platform BlockedPopupContainer model/controller object.
 //
 // TODO(erg): The unit tests on BlockedPopupContainer need to be greatly
 // expanded.
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "app/app_paths.h"
 #include "base/path_service.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/tab_contents/test_web_contents.h"
-#include "chrome/browser/renderer_host/test_render_view_host.h"
+#include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/test/testing_profile.h"
 #include "net/base/net_util.h"
 
 namespace {
 const std::string host1 = "host1";
 }  // namespace
 
 // Mock for our view.
 class MockBlockedPopupContainerView : public BlockedPopupContainerView {
  public:
@@ skipping 65 matching lines @@
   popup->controller().LoadURLLazily(GetTestCase("error"), GURL(),
                                     PageTransition::LINK,
                                     L"", NULL);
   container_->AddTabContents(popup, gfx::Rect(), host1);
 
   EXPECT_EQ(container_->GetBlockedPopupCount(), static_cast<size_t>(1));
   EXPECT_EQ(container_->GetTabContentsAt(0), popup);
   EXPECT_FALSE(container_->IsHostWhitelisted(0));
   EXPECT_THAT(container_->GetHosts(), testing::Contains(host1));
 }