Add fallback URLFetcher factory to GcdPrivateAPITest.

chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 198 matching lines @@
 
    private:
     FakeGCDApiFlowFactory* factory_;
   };
 
   std::map<GURL /*request url*/, std::string /*response json*/> responses_;
 };
 
 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();
     test_service_discovery_client_->Start();
 #endif  // ENABLE_MDNS
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         extensions::switches::kWhitelistedExtensionID,
         "ddchlicdkolnonkihahngkmmmjnjlkkf");
   }
 
  protected:
   FakeGCDApiFlowFactory api_flow_factory_;
+  net::URLFetcherImplFactory url_fetcher_impl_factory_;
   net::FakeURLFetcherFactory url_fetcher_factory_;
 
 #if defined(ENABLE_MDNS)
   scoped_refptr<local_discovery::TestServiceDiscoveryClient>
       test_service_discovery_client_;
 #endif  // ENABLE_MDNS
 };
 
 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, GetCloudList) {
   api_flow_factory_.SetResponse(
@@ skipping 35 matching lines @@
       base::Bind(&local_discovery::TestServiceDiscoveryClient::SimulateReceive,
                  test_service_discovery_client_,
                  kAnnouncePacket,
                  sizeof(kAnnouncePacket)),
       base::TimeDelta::FromSeconds(1));
 
   EXPECT_TRUE(
       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));
 
   base::MessageLoopProxy::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&local_discovery::TestServiceDiscoveryClient::SimulateReceive,
                  test_service_discovery_client_,
                  kGoodbyePacket,
                  sizeof(kGoodbyePacket)),
       base::TimeDelta::FromSeconds(1));
 
   EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "remove_device.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(GcdPrivateAPITest, SendQuery) {
 // TODO(noamsml): Win Dbg has a workaround that makes RunExtensionSubtest
 // always return true without actually running the test. Remove when fixed.
 // See http://crbug.com/177163 for details.
 #if !defined(OS_WIN) || defined(NDEBUG)
   EXPECT_CALL(*test_service_discovery_client_,
               OnSendTo(std::string(reinterpret_cast<const char*>(kQueryPacket),
                                    sizeof(kQueryPacket)))).Times(2);
 #endif
   EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "send_query.html"));
 }
 
 #endif  // ENABLE_MDNS
 
 }  // namespace