pubsub: pull grpc module from common-grpc (#2701)

Author: callmehiphop

packages/pubsub/package.json

@@ -52,14 +52,13 @@
   ],
   "dependencies": {
     "@google-cloud/common": "^0.13.0",
-    "@google-cloud/common-grpc": "^0.4.0",
+    "@google-cloud/common-grpc": "^0.4.2",
     "arrify": "^1.0.0",
     "async-each": "^1.0.1",
     "extend": "^3.0.0",
     "google-auto-auth": "^0.7.1",
-    "google-gax": "^0.14.2",
+    "google-gax": "^0.13.0",
     "google-proto-files": "^0.13.1",
-    "grpc": "^1.6.0",
     "is": "^3.0.1",
     "lodash.snakecase": "^4.1.1",
     "uuid": "^3.0.1"

packages/pubsub/src/connection-pool.js

@@ -24,7 +24,7 @@ var arrify = require('arrify');
 var common = require('@google-cloud/common');
 var each = require('async-each');
 var events = require('events');
-var grpc = require('grpc');
+var grpc = require('@google-cloud/common-grpc').grpc;
 var is = require('is');
 var util = require('util');
 var uuid = require('uuid');

packages/pubsub/test/connection-pool.js

@@ -95,7 +95,9 @@ describe('ConnectionPool', function() {
       '@google-cloud/common': {
         util: fakeUtil
       },
-      grpc: fakeGrpc,
+      '@google-cloud/common-grpc': {
+        grpc: fakeGrpc
+      },
       uuid: fakeUuid,
       './v1': fakeV1
     });