Revert 245326 "Basic implementation of the Sync C++ fake server"

> Basic implementation of the Sync C++ fake server
> 
> This CL provides just enough functionality so that
> PrototypeFakeServerTest will pass.
> 
> BUG=323265
> 
> Review URL: https://codereview.chromium.org/115243007

TBR=pvalenzuela@chromium.org

Review URL: https://codereview.chromium.org/130503007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245341 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync/test/integration/prototype_fake_server_test.cc

-// Copyright 2014 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/browser/sync/test/integration/sync_test.h"
-
-class PrototypeFakeServerTest : public SyncTest {
- public:
-  PrototypeFakeServerTest() : SyncTest(SINGLE_CLIENT) {
-    UseFakeServer();
-  }
-
-  virtual ~PrototypeFakeServerTest() {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PrototypeFakeServerTest);
-};
-
-// TODO(pvalenzuela): Remove this test when sync_integration_tests is
-// transitioned to use the C++ fake server. This test currently exists to
-// ensure fake server functionality during development. See Bug 323265.
-IN_PROC_BROWSER_TEST_F(PrototypeFakeServerTest, Setup) {
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-}

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

@@ -60,8 +60,6 @@
 #include "sync/engine/sync_scheduler_impl.h"
 #include "sync/notifier/p2p_invalidator.h"
 #include "sync/protocol/sync.pb.h"
-#include "sync/test/fake_server/fake_server.h"
-#include "sync/test/fake_server/fake_server_network_resources.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
@@ -145,34 +143,30 @@ void SyncTest::SetUp() {
     password_ = "password";
   }
 
-  // Only set |server_type_| if it hasn't already been set. This allows for
-  // IN_PROCESS_FAKE_SERVER tests to set this value in each test class.
-  if (server_type_ == SERVER_TYPE_UNDECIDED) {
-    if (!cl->HasSwitch(switches::kSyncServiceURL) &&
-        !cl->HasSwitch(switches::kSyncServerCommandLine)) {
-      // If neither a sync server URL nor a sync server command line is
-      // provided, start up a local python sync test server and point Chrome
-      // to its URL.  This is the most common configuration, and the only
-      // one that makes sense for most developers.
-      server_type_ = LOCAL_PYTHON_SERVER;
-    } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
-               cl->HasSwitch(switches::kSyncServerCommandLine)) {
-      // If a sync server URL and a sync server command line are provided,
-      // start up a local sync server by running the command line. Chrome
-      // will connect to the server at the URL that was provided.
-      server_type_ = LOCAL_LIVE_SERVER;
-    } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
-               !cl->HasSwitch(switches::kSyncServerCommandLine)) {
-      // If a sync server URL is provided, but not a server command line,
-      // it is assumed that the server is already running. Chrome will
-      // automatically connect to it at the URL provided. There is nothing
-      // to do here.
-      server_type_ = EXTERNAL_LIVE_SERVER;
-    } else {
-      // If a sync server command line is provided, but not a server URL,
-      // we flag an error.
-      LOG(FATAL) << "Can't figure out how to run a server.";
-    }
+  if (!cl->HasSwitch(switches::kSyncServiceURL) &&
+      !cl->HasSwitch(switches::kSyncServerCommandLine)) {
+    // If neither a sync server URL nor a sync server command line is
+    // provided, start up a local python sync test server and point Chrome
+    // to its URL.  This is the most common configuration, and the only
+    // one that makes sense for most developers.
+    server_type_ = LOCAL_PYTHON_SERVER;
+  } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
+             cl->HasSwitch(switches::kSyncServerCommandLine)) {
+    // If a sync server URL and a sync server command line are provided,
+    // start up a local sync server by running the command line. Chrome
+    // will connect to the server at the URL that was provided.
+    server_type_ = LOCAL_LIVE_SERVER;
+  } else if (cl->HasSwitch(switches::kSyncServiceURL) &&
+             !cl->HasSwitch(switches::kSyncServerCommandLine)) {
+    // If a sync server URL is provided, but not a server command line,
+    // it is assumed that the server is already running. Chrome will
+    // automatically connect to it at the URL provided. There is nothing
+    // to do here.
+    server_type_ = EXTERNAL_LIVE_SERVER;
+  } else {
+    // If a sync server command line is provided, but not a server URL,
+    // we flag an error.
+    LOG(FATAL) << "Can't figure out how to run a server.";
   }
 
   if (username_.empty() || password_.empty())
@@ -322,15 +316,7 @@ void SyncTest::InitializeInstance(int index) {
   // Make sure the ProfileSyncService has been created before creating the
   // ProfileSyncServiceHarness - some tests expect the ProfileSyncService to
   // already exist.
-  ProfileSyncService* profile_sync_service =
-      ProfileSyncServiceFactory::GetForProfile(GetProfile(index));
-
-  if (server_type_ == IN_PROCESS_FAKE_SERVER) {
-    // TODO(pvalenzuela): Run the fake server via EmbeddedTestServer.
-    profile_sync_service->OverrideNetworkResourcesForTest(
-        make_scoped_ptr<syncer::NetworkResources>(
-            new syncer::FakeServerNetworkResources(fake_server_.get())));
-  }
+  ProfileSyncServiceFactory::GetForProfile(GetProfile(index));
 
   clients_[index] =
       ProfileSyncServiceHarness::CreateForIntegrationTest(
@@ -523,11 +509,6 @@ void SyncTest::SetUpTestServerIfRequired() {
       LOG(FATAL) << "Failed to set up local python XMPP server";
     if (!SetUpLocalTestServer())
       LOG(FATAL) << "Failed to set up local test server";
-  } else if (server_type_ == IN_PROCESS_FAKE_SERVER) {
-    fake_server_.reset(new syncer::FakeServer());
-    // Similar to LOCAL_LIVE_SERVER, we must start this for XMPP.
-    SetUpLocalPythonTestServer();
-    SetupMockGaiaResponses();
   } else if (server_type_ == EXTERNAL_LIVE_SERVER) {
     // Nothing to do; we'll just talk to the URL we were given.
   } else {
@@ -881,8 +862,3 @@ void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }
-
-void SyncTest::UseFakeServer() {
-  DCHECK_EQ(SERVER_TYPE_UNDECIDED, server_type_);
-  server_type_ = IN_PROCESS_FAKE_SERVER;
-}

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

@@ -18,7 +18,6 @@
 #include "net/url_request/url_request_status.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
-#include "sync/test/fake_server/fake_server.h"
 #include "sync/test/local_sync_test_server.h"
 
 
@@ -58,18 +57,14 @@ class SyncTest : public InProcessBrowserTest {
   // The type of server we're running against.
   enum ServerType {
     SERVER_TYPE_UNDECIDED,
-    LOCAL_PYTHON_SERVER,    // The mock python server that runs locally and is
-                            // part of the Chromium checkout.
-    LOCAL_LIVE_SERVER,      // Some other server (maybe the real binary used by
-                            // Google's sync service) that can be started on
-                            // a per-test basis by running a command
-    EXTERNAL_LIVE_SERVER,   // A remote server that the test code has no control
-                            // over whatsoever; cross your fingers that the
-                            // account state is initially clean.
-    IN_PROCESS_FAKE_SERVER, // The fake Sync server (FakeServer) running
-                            // in-process (bypassing HTTP calls). This
-                            // ServerType will eventually replace
-                            // LOCAL_PYTHON_SERVER.
+    LOCAL_PYTHON_SERVER,   // The mock python server that runs locally and is
+                           // part of the Chromium checkout.
+    LOCAL_LIVE_SERVER,     // Some other server (maybe the real binary used by
+                           // Google's sync service) that can be started on
+                           // a per-test basis by running a command
+    EXTERNAL_LIVE_SERVER,  // A remote server that the test code has no control
+                           // over whatsoever; cross your fingers that the
+                           // account state is initially clean.
   };
 
   // NOTE: IMPORTANT the enum here should match with
@@ -256,12 +251,6 @@ class SyncTest : public InProcessBrowserTest {
   void DisableNotificationsImpl();
   void EnableNotificationsImpl();
 
-  // Set up the test to use the in-process fake server. This must be called
-  // before SetUp().
-  // TODO(pvalenzuela): Remove this method when the C++ fake server becomes
-  // the default server type.
-  void UseFakeServer();
-
   // GAIA account used by the test case.
   std::string username_;
 
@@ -271,9 +260,6 @@ class SyncTest : public InProcessBrowserTest {
   // Locally available plain text file in which GAIA credentials are stored.
   base::FilePath password_file_;
 
-  // The FakeServer used in tests with server type IN_PROCESS_FAKE_SERVER.
-  scoped_ptr<syncer::FakeServer> fake_server_;
-
  private:
   // Helper to ProfileManager::CreateProfile that handles path creation.
   static Profile* MakeProfile(const base::FilePath::StringType name);

chrome/chrome_tests.gypi

@@ -2312,7 +2312,6 @@
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../sync/sync.gyp:test_support_sync_testserver',
-        '../sync/sync.gyp:test_support_sync_fake_server',
         '../ui/app_list/app_list.gyp:app_list_test_support',
       ],
       'include_dirs': [
@@ -2435,15 +2434,6 @@
         'browser/sync/test/integration/multiple_client_preferences_sync_test.cc',
         'browser/sync/test/integration/multiple_client_sessions_sync_test.cc',
         'browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc',
-        'browser/sync/test/integration/passwords_helper.cc',
-        'browser/sync/test/integration/passwords_helper.h',
-        'browser/sync/test/integration/preferences_helper.cc',
-        'browser/sync/test/integration/preferences_helper.h',
-        'browser/sync/test/integration/prototype_fake_server_test.cc',
-        'browser/sync/test/integration/search_engines_helper.cc',
-        'browser/sync/test/integration/search_engines_helper.h',
-        'browser/sync/test/integration/sessions_helper.cc',
-        'browser/sync/test/integration/sessions_helper.h',
         'browser/sync/test/integration/single_client_app_list_sync_test.cc',
         'browser/sync/test/integration/single_client_apps_sync_test.cc',
         'browser/sync/test/integration/single_client_bookmarks_sync_test.cc',

sync/sync_tests.gypi

@@ -90,31 +90,6 @@
       ],
     },
 
-    # Test support files for the fake sync server.
-    {
-      'target_name': 'test_support_sync_fake_server',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        'sync',
-      ],
-      'export_dependent_settings': [
-        'sync',
-      ],
-      'sources': [
-        'test/fake_server/fake_server.h',
-        'test/fake_server/fake_server.cc',
-        'test/fake_server/fake_server_http_post_provider.h',
-        'test/fake_server/fake_server_http_post_provider.cc',
-        'test/fake_server/fake_server_network_resources.h',
-        'test/fake_server/fake_server_network_resources.cc',
-      ],
-    },
-
     # Test support files for the 'sync_notifier' target.
     {
       'target_name': 'test_support_sync_notifier',

sync/test/fake_server/fake_server.h

-// Copyright 2014 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 SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
-#define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
-
-#include <map>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/protocol/sync.pb.h"
-
-namespace syncer {
-
-// A fake version of the Sync server used for testing.
-class FakeServer {
- public:
-  FakeServer();
-  virtual ~FakeServer();
-
-  // Handles a /command POST to the server. If the return value is 0 (success),
-  // |response_code| and |response| will be set. Otherwise, the return value
-  // will be a network error code.
-  int HandleCommand(std::string request,
-                    int* response_code,
-                    std::string* response);
-
- private:
-  typedef std::map<std::string, sync_pb::SyncEntity> EntityMap;
-
-  // Processes a GetUpdates call.
-  sync_pb::ClientToServerResponse HandleGetUpdatesRequest(
-      const sync_pb::ClientToServerMessage& message);
-
-  // Processes a Commit call.
-  sync_pb::ClientToServerResponse HandleCommitRequest(
-      const sync_pb::ClientToServerMessage& message);
-
-  // Inserts the appropriate permanent items in |entities_|.
-  void CreateDefaultPermanentItems(
-      const std::vector<ModelType>& first_time_types);
-
-  // Creates and saves a SyncEntity of the given |model_type|. The entity's
-  // id_string and server_defined_unique_tag fields are set to |id|. The
-  // non_unique_name and name fields are set to |name|. Since tags are used as
-  // ids, the parent_id_string field is set to |parent_tag|.
-  void CreateSyncEntity(ModelType model_type,
-                        const std::string& id,
-                        const std::string& name,
-                        const std::string& parent_tag);
-
-  // Saves a |entity| to |entities_|.
-  void SaveEntity(sync_pb::SyncEntity entity);
-
-  // Commits a client-side |entity| to |entities_|.
-  sync_pb::SyncEntity CommitEntity(sync_pb::SyncEntity entity,
-                                   std::string guid);
-
-  // This is the last version number assigned to an entity. The next entity will
-  // have a version number of version_ + 1.
-  int64 version_;
-
-  // The current birthday value.
-  std::string birthday_;
-
-  // All SyncEntity objects saved by the server. The key value is the entity's
-  // id string.
-  EntityMap entities_;
-
-  // All Keystore keys known to the server.
-  std::vector<std::string> keystore_keys_;
-};
-
-}  // namespace syncer
-
-#endif  // SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_

sync/test/fake_server/fake_server_http_post_provider.cc

-// Copyright 2014 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 "sync/test/fake_server/fake_server_http_post_provider.h"
-
-#include <string>
-
-#include "sync/test/fake_server/fake_server.h"
-
-namespace syncer {
-
-FakeServerHttpPostProviderFactory::FakeServerHttpPostProviderFactory(
-    FakeServer* fake_server) : fake_server_(fake_server) { }
-
-FakeServerHttpPostProviderFactory::~FakeServerHttpPostProviderFactory() { }
-
-void FakeServerHttpPostProviderFactory::Init(const std::string& user_agent) { }
-
-HttpPostProviderInterface* FakeServerHttpPostProviderFactory::Create() {
-  FakeServerHttpPostProvider* http =
-      new FakeServerHttpPostProvider(fake_server_);
-  http->AddRef();
-  return http;
-}
-
-void FakeServerHttpPostProviderFactory::Destroy(
-    HttpPostProviderInterface* http) {
-  static_cast<FakeServerHttpPostProvider*>(http)->Release();
-}
-
-FakeServerHttpPostProvider::FakeServerHttpPostProvider(
-    FakeServer* fake_server) : fake_server_(fake_server) { }
-
-FakeServerHttpPostProvider::~FakeServerHttpPostProvider() { }
-
-void FakeServerHttpPostProvider::SetExtraRequestHeaders(const char* headers) {
-  // TODO(pvalenzuela): Add assertions on this value.
-  extra_request_headers_.assign(headers);
-}
-
-void FakeServerHttpPostProvider::SetURL(const char* url, int port) {
-  // TODO(pvalenzuela): Add assertions on these values.
-  request_url_.assign(url);
-  request_port_ = port;
-}
-
-void FakeServerHttpPostProvider::SetPostPayload(const char* content_type,
-                                                int content_length,
-                                                const char* content) {
-  request_content_type_.assign(content_type);
-  request_content_.assign(content, content_length);
-}
-
-bool FakeServerHttpPostProvider::MakeSynchronousPost(int* error_code,
-                                                     int* response_code) {
-  // This assumes that a POST is being made to /command.
-  *error_code = fake_server_->HandleCommand(request_content_,
-                                            response_code,
-                                            &response_);
-  return (*error_code == 0);
-}
-
-int FakeServerHttpPostProvider::GetResponseContentLength() const {
-  return response_.length();
-}
-
-const char* FakeServerHttpPostProvider::GetResponseContent() const {
-  return response_.c_str();
-}
-
-const std::string FakeServerHttpPostProvider::GetResponseHeaderValue(
-    const std::string& name) const {
-  return "";
-}
-
-void FakeServerHttpPostProvider::Abort() {
-}
-
-}  // namespace syncer

sync/test/fake_server/fake_server_http_post_provider.h

-// Copyright 2014 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 SYNC_TEST_FAKE_SERVER_FAKE_SERVER_HTTP_POST_PROVIDER_H_
-#define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_HTTP_POST_PROVIDER_H_
-
-#include <string>
-
-#include "base/memory/ref_counted.h"
-#include "sync/internal_api/public/http_post_provider_factory.h"
-#include "sync/internal_api/public/http_post_provider_interface.h"
-
-namespace syncer {
-
-class FakeServer;
-
-class FakeServerHttpPostProvider
-    : public HttpPostProviderInterface,
-      public base::RefCountedThreadSafe<FakeServerHttpPostProvider> {
- public:
-  FakeServerHttpPostProvider(FakeServer* fake_server);
-
-  // HttpPostProviderInterface implementation.
-  virtual void SetExtraRequestHeaders(const char* headers) OVERRIDE;
-  virtual void SetURL(const char* url, int port) OVERRIDE;
-  virtual void SetPostPayload(const char* content_type, int content_length,
-                              const char* content) OVERRIDE;
-  virtual bool MakeSynchronousPost(int* error_code,
-                                   int* response_code) OVERRIDE;
-  virtual void Abort() OVERRIDE;
-  virtual int GetResponseContentLength() const OVERRIDE;
-  virtual const char* GetResponseContent() const OVERRIDE;
-  virtual const std::string GetResponseHeaderValue(
-      const std::string& name) const OVERRIDE;
-
- protected:
-  friend class base::RefCountedThreadSafe<FakeServerHttpPostProvider>;
-  virtual ~FakeServerHttpPostProvider();
-
- private:
-  FakeServer* const fake_server_;
-  std::string response_;
-  std::string request_url_;
-  int request_port_;
-  std::string request_content_;
-  std::string request_content_type_;
-  std::string extra_request_headers_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeServerHttpPostProvider);
-};
-
-class FakeServerHttpPostProviderFactory : public HttpPostProviderFactory {
- public:
-  FakeServerHttpPostProviderFactory(FakeServer* fake_server);
-  virtual ~FakeServerHttpPostProviderFactory();
-
-  // HttpPostProviderFactory:
-  virtual void Init(const std::string& user_agent) OVERRIDE;
-  virtual HttpPostProviderInterface* Create() OVERRIDE;
-  virtual void Destroy(HttpPostProviderInterface* http) OVERRIDE;
-
- private:
-  FakeServer* const fake_server_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeServerHttpPostProviderFactory);
-};
-
-}  //  namespace syncer
-
-#endif  // SYNC_TEST_FAKE_SERVER_FAKE_SERVER_HTTP_POST_PROVIDER_H_

sync/test/fake_server/fake_server_network_resources.cc

-// Copyright 2014 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 "sync/test/fake_server/fake_server_network_resources.h"
-
-#include "base/memory/scoped_ptr.h"
-#include "sync/internal_api/public/base/cancelation_signal.h"
-#include "sync/internal_api/public/http_post_provider_factory.h"
-#include "sync/internal_api/public/network_time_update_callback.h"
-#include "sync/test/fake_server/fake_server.h"
-#include "sync/test/fake_server/fake_server_http_post_provider.h"
-
-namespace syncer {
-
-FakeServerNetworkResources::FakeServerNetworkResources(FakeServer* fake_server)
-    : fake_server_(fake_server) { }
-
-FakeServerNetworkResources::~FakeServerNetworkResources() {}
-
-scoped_ptr<HttpPostProviderFactory>
-    FakeServerNetworkResources::GetHttpPostProviderFactory(
-        net::URLRequestContextGetter* baseline_context_getter,
-        const NetworkTimeUpdateCallback& network_time_update_callback,
-        CancelationSignal* cancelation_signal) {
-  return make_scoped_ptr<HttpPostProviderFactory>(
-      new FakeServerHttpPostProviderFactory(fake_server_));
-}
-
-}  // namespace syncer

sync/test/fake_server/fake_server_network_resources.h

-// Copyright 2014 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 SYNC_TEST_FAKE_SERVER_FAKE_SERVER_NETWORK_RESOURCES_H_
-#define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_NETWORK_RESOURCES_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "sync/internal_api/public/network_resources.h"
-#include "sync/internal_api/public/network_time_update_callback.h"
-
-namespace net {
-class URLRequestContextGetter;
-}  // namespace net
-
-namespace syncer {
-
-class FakeServer;
-class HttpPostProviderFactory;
-
-class FakeServerNetworkResources : public NetworkResources {
-  public:
-   FakeServerNetworkResources(FakeServer* fake_server);
-   virtual ~FakeServerNetworkResources();
-
-   // NetworkResources
-   virtual scoped_ptr<HttpPostProviderFactory> GetHttpPostProviderFactory(
-       net::URLRequestContextGetter* baseline_context_getter,
-       const NetworkTimeUpdateCallback& network_time_update_callback,
-       CancelationSignal* cancelation_signal) OVERRIDE;
-
-  private:
-   FakeServer* const fake_server_;
-};
-
-}  // namespace syncer
-
-#endif  // SYNC_TEST_FAKE_SERVER_FAKE_SERVER_NETWORK_RESOURCES_H_