Re-apply http://codereview.chromium.org/1622012

chrome/test/live_sync/live_sync_test.h

Index: chrome/test/live_sync/live_sync_test.h
diff --git a/chrome/test/live_sync/live_sync_test.h b/chrome/test/live_sync/live_sync_test.h
index 9fd33734fdb27a9fafb218fa6c091028d53848f2..cb117959f2421e5dee0b6cb9fbe19d674d628b6a 100644
--- a/chrome/test/live_sync/live_sync_test.h
+++ b/chrome/test/live_sync/live_sync_test.h
@@ -12,6 +12,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "googleurl/src/gurl.h"
+#include "net/socket/ssl_test_util.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ -45,10 +46,30 @@ class LiveSyncTest : public InProcessBrowserTest {
     ASSERT_FALSE(password_.empty()) << "Can't run live server test "
         << "without specifying --" << switches::kSyncPasswordForTest;
 
+    // Unless a sync server was explicitly provided, run a test one locally.
+    // TODO(ncarter): It might be better to allow the user to specify a choice
+    // of sync server "providers" -- a script that could locate (or allocate)
+    // a sync server instance, possibly on some remote host.  The provider
+    // would be invoked before each test.
+    if (!cl->HasSwitch(switches::kSyncServiceURL))
+      SetUpLocalTestServer();
+
     // Yield control back to the InProcessBrowserTest framework.
     InProcessBrowserTest::SetUp();
   }
 
+  virtual void SetUpLocalTestServer() {
+    bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
+        server_.kHostName, server_.kOKHTTPSPort,
+        FilePath(), FilePath(), std::wstring());
+    ASSERT_TRUE(success);
+
+    CommandLine* cl = CommandLine::ForCurrentProcess();
+    cl->AppendSwitchWithValue(switches::kSyncServiceURL,
+        StringPrintf("http://%s:%d/chromiumsync", server_.kHostName,
+            server_.kOKHTTPSPort));
+  }
+
   // Append command line flag to enable sync.
   virtual void SetUpCommandLine(CommandLine* command_line) {
   }
@@ -78,6 +99,8 @@ class LiveSyncTest : public InProcessBrowserTest {
   // to override the default resolver while the test is active.
   scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_;
 
+  net::TestServerLauncher server_;
+
   DISALLOW_COPY_AND_ASSIGN(LiveSyncTest);
 };