[sync] Divorce python sync test server chromiumsync.py from testserver.py

chrome/browser/sync/test/integration/sync_test.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_
 
 #include "chrome/test/base/in_process_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/process_util.h"
 #include "net/base/mock_host_resolver.h"
-#include "net/test/local_sync_test_server.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
+#include "sync/test/local_sync_test_server.h"
 
 class CommandLine;
 class Profile;
 class ProfileSyncServiceHarness;
 
 namespace net {
 class FakeURLFetcherFactory;
 class ProxyConfig;
 class ScopedDefaultHostResolverProc;
 class URLFetcherImplFactory;
@@ skipping 262 matching lines @@
   // Helper method used to set up fake responses for kClientLoginUrl,
   // kIssueAuthTokenUrl, kGetUserInfoUrl and kSearchDomainCheckUrl in order to
   // mock out calls to GAIA servers.
   void SetupMockGaiaResponses();
 
   // Helper method used to clear any fake responses that might have been set for
   // various gaia URLs, cancel any outstanding URL requests, and return to using
   // the default URLFetcher creation mechanism.
   void ClearMockGaiaResponses();
 
-  // Test server of type sync, started on demand.
-  net::LocalSyncTestServer sync_server_;
+  // Python sync test server, started on demand.
+  syncer::LocalSyncTestServer sync_server_;
 
   // Helper class to whitelist the notification port.
   scoped_ptr<net::ScopedPortException> xmpp_port_;
 
   // Used to differentiate between single-client, two-client, multi-client and
   // many-client tests.
   TestType test_type_;
 
   // Tells us what kind of server we're using (some tests run only on certain
   // server types).
@@ skipping 45 matching lines @@
   scoped_ptr<net::URLFetcherImplFactory> factory_;
 
   // Number of default entries (as determined by the existing entries at setup
   // time on client 0).
   size_t number_of_default_sync_items_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncTest);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_TEST_H_