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..7ca2d4f413a5651f90af977aea537a38315e975c 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -2605,15 +2605,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',
             'net',
           ],
           'sources': [
@@ -2628,7 +2627,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 +2653,42 @@
           ],
         },
         {
+          'target_name': 'flip_in_mem_edsm_server',
+          'type': 'executable',
+          'cflags': [
+            '-Wno-deprecated',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../third_party/openssl/openssl.gyp:openssl',
+            'flip_balsa_and_epoll_library',
+            'flip_in_mem_edsm_server_library',
+            'net',
+          ],
+          'sources': [
+            'tools/flip_server/flip_in_mem_edsm_server.cc',
+          ],
+        },
+        {
+          'target_name': 'flip_in_mem_edsm_server_unittests',

[Ryan Hamilton, 2013/08/02 23:30:48]

Instead of a new target, how 'bout putting it in net_unittests?

[yhirano, 2013/08/05 02:05:23]

Done.

+          'type': '<(gtest_target_type)',
+          'dependencies': [
+            '../testing/gtest.gyp:gtest',
+            '../testing/gmock.gyp:gmock',
+            '../third_party/openssl/openssl.gyp:openssl',
+            'flip_in_mem_edsm_server_library',
+            'flip_balsa_and_epoll_library',
+            'net',
+            'net_test_support',
+          ],
+          'cflags': [
+            '-Wno-deprecated',
+          ],
+          'sources': [
+            'tools/flip_server/test/run_all_unittests.cc',
+          ],
+        },
+        {
           'target_name': 'quic_library',
           'type': 'static_library',
           'dependencies': [