Move files out of chrome\browser\renderer_host\test alongside their source. ...

content/browser/renderer_host/render_view_host_manager_browsertest.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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/renderer_host/site_instance.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/site_instance.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 
 class RenderViewHostManagerTest : public InProcessBrowserTest {
  public:
   RenderViewHostManagerTest() {
     EnableDOMAutomation();
   }
 
   static bool GetFilePathWithHostAndPortReplacement(
@@ skipping 150 matching lines @@
   // Should have the same SiteInstance.
   scoped_refptr<SiteInstance> noref_site_instance(
       browser()->GetSelectedTabContents()->GetSiteInstance());
   EXPECT_EQ(orig_site_instance, noref_site_instance);
 }
 
 // Hangs flakily in Win, http://crbug.com/45040.
 #if defined(OS_WIN)
 #define MAYBE_ChromeURLAfterDownload DISABLED_ChromeURLAfterDownload
 #else
-#defne MAYBE_ChromeURLAfterDownload ChromeURLAfterDownload
+#define MAYBE_ChromeURLAfterDownload ChromeURLAfterDownload
 #endif  // defined(OS_WIN)
 
 // Test for crbug.com/14505. This tests that chrome:// urls are still functional
 // after download of a file while viewing another chrome://.
 IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
                        MAYBE_ChromeURLAfterDownload) {
   GURL downloads_url("chrome://downloads");
   GURL extensions_url("chrome://extensions");
   FilePath zip_download;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &zip_download));
@@ skipping 66 matching lines @@
       &result));
   EXPECT_TRUE(result);
   ui_test_utils::NavigateToURL(browser(), zip_url);
 
   ui_test_utils::WaitForDownloadCount(
     browser()->profile()->GetDownloadManager(), 1);
 
   browser()->CloseWindow();
   BrowserClosedObserver wait_for_close(browser());
 }