Revert "[Third time landing] Python implementation of sync server, for testing."

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2010 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/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 75 matching lines @@
 }
 
 void InProcessBrowserTest::SetUp() {
   // Cleanup the user data dir.
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   ASSERT_LT(10, static_cast<int>(user_data_dir.value().size())) <<
       "The user data directory name passed into this test was too "
       "short to delete safely.  Please check the user-data-dir "
       "argument and try again.";
-  ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true));
+  if (ShouldDeleteProfile())
+    ASSERT_TRUE(file_util::DieFileDie(user_data_dir, true));
 
   // The unit test suite creates a testingbrowser, but we want the real thing.
   // Delete the current one. We'll install the testing one in TearDown.
   delete g_browser_process;
-  g_browser_process = NULL;
-
-  SetUpUserDataDirectory();
 
   // 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::ForCurrentProcessMutable();
   original_command_line_.reset(new CommandLine(*command_line));
 
   SetUpCommandLine(command_line);
@@ skipping 21 matching lines @@
   command_line->AppendSwitch(switches::kNoSandbox);
 
   // Don't show the first run ui.
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // This is a Browser test.
   command_line->AppendSwitchWithValue(switches::kTestType,
                                       ASCIIToWide(kBrowserTestType));
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
-  // explicitly.
+  // explicitlty.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
   // Explicitly set the path of the exe used for the renderer and plugin,
   // otherwise they'll try to use unit_test.exe.
   FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName();
   subprocess_path = subprocess_path.AppendASCII(WideToASCII(
@@ skipping 118 matching lines @@
       ChromeThread::IO, FROM_HERE,
       NewRunnableFunction(chrome_browser_net::SetUrlRequestMocksEnabled, true));
 
   browser_ = CreateBrowser(profile);
 
   // Start the timeout timer to prevent hangs.
   MessageLoopForUI::current()->PostDelayedTask(FROM_HERE,
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
       initial_timeout_);
 
-  // If an ASSERT_ failed during SetUp, skip the InProcessBrowserTest test body.
-  if (!HasFatalFailure())
-    RunTestOnMainThread();
+  RunTestOnMainThread();
   CleanUpOnMainThread();
 
   // Close all browser windows.  This might not happen immediately, since some
   // may need to wait for beforeunload and unload handlers to fire in a tab.
   // When all windows are closed, the last window will call Quit(). Call
   // Quit() explicitly if no windows are open.
 #if defined(OS_MACOSX)
   // When the browser window closes, Cocoa will generate an inner-loop that
   // processes the RenderProcessHost delete task, so allow task nesting.
   bool old_state = MessageLoopForUI::current()->NestableTasksAllowed();
@@ skipping 75 matching lines @@
 
   GTEST_NONFATAL_FAILURE_(error_message.c_str());
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }