| Index: chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
|
| index 17e92d7ebfbe1ad90aedb9eb450e6cd3064a79c7..12ec84f4cf1f51427c37ed125376f0f3f4359853 100644
|
| --- a/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc
|
| @@ -216,7 +216,7 @@ class FakeGCDApiFlowFactory
|
|
|
| class GcdPrivateAPITest : public ExtensionApiTest {
|
| public:
|
| - GcdPrivateAPITest() : url_fetcher_factory_(NULL) {
|
| + GcdPrivateAPITest() : url_fetcher_factory_(&url_fetcher_impl_factory_) {
|
| #if defined(ENABLE_MDNS)
|
| test_service_discovery_client_ =
|
| new local_discovery::TestServiceDiscoveryClient();
|
| @@ -233,6 +233,7 @@ class GcdPrivateAPITest : public ExtensionApiTest {
|
|
|
| protected:
|
| FakeGCDApiFlowFactory api_flow_factory_;
|
| + net::URLFetcherImplFactory url_fetcher_impl_factory_;
|
| net::FakeURLFetcherFactory url_fetcher_factory_;
|
|
|
| #if defined(ENABLE_MDNS)
|
| @@ -288,8 +289,7 @@ IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, AddAfter) {
|
| RunExtensionSubtest("gcd_private/api", "receive_new_device.html"));
|
| }
|
|
|
| -// http://crbug.com/312328
|
| -IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, DISABLED_AddRemove) {
|
| +IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, AddRemove) {
|
| test_service_discovery_client_->SimulateReceive(kAnnouncePacket,
|
| sizeof(kAnnouncePacket));
|
|
|
|
|