Rearrange net.gyp to enable adding flip server unittests to net_unittests.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index a973e0808726a40559b8f0a4f1ea9dab4ce9f867..c2f5592df7def1d1817516752225456e7b7ee3de 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1852,7 +1852,9 @@
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'dependencies': [
-            'quic_library'
+            'quic_library',
+            'flip_in_mem_edsm_server_library',
+            'flip_balsa_and_epoll_library',
           ],
           'sources': [
             'tools/flip_server/simple_buffer.cc',
@@ -2605,15 +2607,14 @@
           ],
         },
         {
-          'target_name': 'flip_in_mem_edsm_server',
-          'type': 'executable',
+          'target_name': 'flip_in_mem_edsm_server_library',
+          'type': 'static_library',
           'cflags': [
             '-Wno-deprecated',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/openssl/openssl.gyp:openssl',
-            'flip_balsa_and_epoll_library',

[Ryan Hamilton, 2013/08/05 15:27:19]

It's not clear to me why the flip_in_mem_edsm_server_library does not depend on
balsa and epoll.  Seems like they surely use balsa and epoll.

[yhirano, 2013/08/06 02:00:44]

Done.

             'net',
           ],
           'sources': [
@@ -2628,7 +2629,6 @@
             'tools/flip_server/create_listener.h',
             'tools/flip_server/flip_config.cc',
             'tools/flip_server/flip_config.h',
-            'tools/flip_server/flip_in_mem_edsm_server.cc',
             'tools/flip_server/http_interface.cc',
             'tools/flip_server/http_interface.h',
             'tools/flip_server/loadtime_measurement.h',
@@ -2655,6 +2655,22 @@
           ],
         },
         {
+          'target_name': 'flip_in_mem_edsm_server',
+          'type': 'executable',
+          'cflags': [
+            '-Wno-deprecated',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+            'flip_balsa_and_epoll_library',
+            'flip_in_mem_edsm_server_library',
+            'net',
+          ],
+          'sources': [
+            'tools/flip_server/flip_in_mem_edsm_server.cc',
+          ],
+        },
+        {
           'target_name': 'quic_library',
           'type': 'static_library',
           'dependencies': [