Move some chrome-specific bits out of InProcessBrowserTest

chrome/test/base/in_process_browser_test.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/base/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
-#include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 10 matching lines @@
 #include "content/renderer/mock_content_renderer_client.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/test/test_server.h"
 #include "sandbox/src/dep.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/system_monitor/system_monitor.h"
 #endif
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/frame/browser_frame_win.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/audio_handler.h"
 #endif
 
 extern int BrowserMain(const MainFunctionParams&);
 
-const char kUnitTestShowWindows[] = "show-windows";
-
 // Passed as value of kTestType.
 static const char kBrowserTestType[] = "browser";
 
 InProcessBrowserTest::InProcessBrowserTest()
     : browser_(NULL),
       show_window_(false),
       dom_automation_enabled_(false),
       tab_closeable_state_watcher_enabled_(false) {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
@@ skipping 27 matching lines @@
   // TODO(phajdan.jr): Extract a smaller test suite so we don't need this.
   DCHECK(g_browser_process);
   delete g_browser_process;
   g_browser_process = NULL;
 
   // Allow subclasses the opportunity to make changes to the default user data
   // dir before running any tests.
   ASSERT_TRUE(SetUpUserDataDirectory())
       << "Could not set up user data directory.";
 
-  // Don't delete the resources when BrowserMain returns. Many ui classes
-  // cache SkBitmaps in a static field so that if we delete the resource
-  // bundle we'll crash.
-  browser_shutdown::delete_resources_on_shutdown = false;
-
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   // Allow subclasses to change the command line before running any tests.
   SetUpCommandLine(command_line);
   // Add command line arguments that are used by all InProcessBrowserTests.
   PrepareTestCommandLine(command_line);
 
   // Single-process mode is not set in BrowserMain, so process it explicitly,
   // and set up renderer.
   if (command_line->HasSwitch(switches::kSingleProcess)) {
     RenderProcessHost::set_run_renderer_in_process(true);
     single_process_renderer_client_.reset(
         new content::MockContentRendererClient);
     content::GetContentClient()->set_renderer(
         single_process_renderer_client_.get());
   }
 
 #if defined(OS_CHROMEOS)
   // Make sure that the log directory exists.
   FilePath log_dir = logging::GetSessionLogFile(*command_line).DirName();
   file_util::CreateDirectory(log_dir);
 #endif  // defined(OS_CHROMEOS)
 
-  SandboxInitWrapper sandbox_wrapper;
-  MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
-  params.ui_task =
-      NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
-
-  host_resolver_ = new net::RuleBasedHostResolverProc(
-      new IntranetRedirectHostResolverProc(NULL));
+  host_resolver_ = new net::RuleBasedHostResolverProc(NULL);
 
   // Something inside the browser does this lookup implicitly. Make it fail
   // to avoid external dependency. It won't break the tests.
   host_resolver_->AddSimulatedFailure("*.google.com");
 
   // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
   // We don't want the test code to use it.
   host_resolver_->AddSimulatedFailure("wpad");
 
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc(
       host_resolver_.get());
 
+  SandboxInitWrapper sandbox_wrapper;
+  MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
+  params.ui_task =
+      NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
+
   SetUpInProcessBrowserTestFixture();
-
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
 void InProcessBrowserTest::PrepareTestCommandLine(CommandLine* command_line) {
   // Propagate commandline settings from test_launcher_utils.
   test_launcher_utils::PrepareBrowserCommandLineForTests(command_line);
 
-#if defined(OS_WIN)
-  // Hide windows on show.
-  if (!command_line->HasSwitch(kUnitTestShowWindows) && !show_window_)

[sky, 2011/09/21 00:12:34]

Where are you going to move this code to?

[Paweł Hajdan Jr., 2011/09/21 01:01:09]

I think this is not needed. Don't windows show by default? At least that's true
on Linux & Mac.

[sky, 2011/09/21 03:30:23]

I believe they show by default, and this code is trying to make them hide. At
least that is my understanding of it.

[Paweł Hajdan Jr., 2011/09/21 16:36:37]

I have just verified this on Windows. The windows are _not_ hidden. Looks like
this code does not work.

In my opinion its removal is a good thing anyway. We shouldn't have big platform
differences for tests, and it doesn't work.

-    BrowserFrameWin::SetShowState(SW_HIDE);
-#endif
-
   if (dom_automation_enabled_)
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   // This is a Browser test.
   command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType);
 
 #if defined(OS_WIN)
   // The Windows sandbox requires that the browser and child processes are the
   // same binary.  So we launch browser_process.exe which loads chrome.dll
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
@@ skipping 33 matching lines @@
       LOG(ERROR) << "Could not create temporary user data directory \""
                  << temp_user_data_dir_.path().value() << "\".";
       return false;
     }
   }
   return test_launcher_utils::OverrideUserDataDir(user_data_dir);
 }
 
 void InProcessBrowserTest::TearDown() {
   DCHECK(!g_browser_process);
-
-  browser_shutdown::delete_resources_on_shutdown = true;
-
-#if defined(OS_WIN)
-  BrowserFrameWin::SetShowState(-1);
-#endif
 }
 
 void InProcessBrowserTest::AddTabAtIndexToBrowser(
     Browser* browser,
     int index,
     const GURL& url,
     PageTransition::Type transition) {
   browser::NavigateParams params(browser, url, transition);
   params.tabstrip_index = index;
   params.disposition = NEW_FOREGROUND_TAB;
@@ skipping 63 matching lines @@
   // executed (as opposed to executed inside a message loop) would autorelease
   // objects into a higher-level pool. This pool is not recycled in-sync with
   // the message loops' pools and causes problems with code relying on
   // deallocation via an autorelease pool (such as browser window closure and
   // browser shutdown). To avoid this, the following pool is recycled after each
   // time code is directly executed.
   base::mac::ScopedNSAutoreleasePool pool;
 
   // Pump startup related events.
   MessageLoopForUI::current()->RunAllPending();
-
-  // In the long term it would be great if we could use a TestingProfile
-  // here and only enable services you want tested, but that requires all
-  // consumers of Profile to handle NULL services.
-  Profile* profile = ProfileManager::GetDefaultProfile();
-  if (!profile) {
-    // We should only be able to get here if the profile already exists and
-    // has been created.
-    NOTREACHED();
-    return;
-  }
   pool.Recycle();
 
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      NewRunnableFunction(chrome_browser_net::SetUrlRequestMocksEnabled, true));
-
-  browser_ = CreateBrowser(profile);
+  browser_ = CreateBrowser(ProfileManager::GetDefaultProfile());
   pool.Recycle();
 
   // Pump any pending events that were created as a result of creating a
   // browser.
   MessageLoopForUI::current()->RunAllPending();
 
   SetUpOnMainThread();
   pool.Recycle();
 
   RunTestOnMainThread();
@@ skipping 11 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndMayExit on a running message loop.
   // CloseAllBrowsersAndMayExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }