Basic implementation of the Sync C++ fake server

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

Index: chrome/browser/sync/test/integration/sync_test.h
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h
index 7a80b288198afdbfc8225de00cc532045cc5ad16..475a15a1226e28627a2399eda76e287d97e546b9 100644
--- a/chrome/browser/sync/test/integration/sync_test.h
+++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -17,6 +17,7 @@
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 #include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/test/fake_server.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "sync/test/local_sync_test_server.h"
 
@@ -65,6 +66,8 @@ class SyncTest : public InProcessBrowserTest {
     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.
+    FAKE_SERVER,           // The fake, in-process server (FakeServer) that

[rlarocque, 2013/12/18 20:22:01]

I'm not sure if FAKE_SERVER is the best name for this.  Wouldn't that be an
equally appropriate name for the python server?

How about IN_PROCESS_SERVER?  Maybe someone else on the review has a better
idea.

[Raghu Simha, 2013/12/18 22:37:12]

I like the name IN_PROCESS_SERVER, but there's already an in-process server in
net/test/embedded_test_server/embedded_test_server.h. It's started with every
browser test, but  the sync integration tests don't use it. Maybe call this
IN_PROCESS_SYNC_SERVER?

Also, it might make sense to rename the files fake_server.* based on what name
you pick here.

[pval...(no longer on Chromium), 2013/12/19 01:16:56]

I changed this to IN_PROCESS_FAKE_SERVER so that it fully describes the setup:
the fake server running in-process.

[pval...(no longer on Chromium), 2013/12/19 01:16:56]

I think the IN_PROCESS_FAKE_SERVER naming makes it clear what's happening here.
I'd prefer to not use IN_PROCESS_SYNC_SERVER because it sounds like it's a real
Sync server being used.

As for renaming the FakeServer-related classes, I'd like to keep those as is
(it's the fake server and how it's used doesn't really matter). 

+                           // will replace LOCAL_PYTHON_SERVER.
   };
 
   // NOTE: IMPORTANT the enum here should match with
@@ -251,6 +254,12 @@ 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_;
 
@@ -260,6 +269,9 @@ 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 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);