Reland of move all reference to carbon api

webrtc/base/macsocketserver_unittest.cc

 /*
  *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 13 matching lines @@
   virtual ~WakeThread() {
     Stop();
   }
   void Run() {
     ss_->WakeUp();
   }
  private:
   SocketServer* ss_;
 };
 
-#ifndef CARBON_DEPRECATED
-
-// Test that MacCFSocketServer::Wait works as expected.
-TEST(MacCFSocketServerTest, TestWait) {
-  MacCFSocketServer server;
-  uint32_t start = Time();
-  server.Wait(1000, true);
-  EXPECT_GE(TimeSince(start), 1000);
-}
-
-// Test that MacCFSocketServer::Wakeup works as expected.
-TEST(MacCFSocketServerTest, TestWakeup) {
-  MacCFSocketServer server;
-  WakeThread thread(&server);
-  uint32_t start = Time();
-  thread.Start();
-  server.Wait(10000, true);
-  EXPECT_LT(TimeSince(start), 10000);
-}
-
-// Test that MacCarbonSocketServer::Wait works as expected.
-TEST(MacCarbonSocketServerTest, TestWait) {
-  MacCarbonSocketServer server;
-  uint32_t start = Time();
-  server.Wait(1000, true);
-  EXPECT_GE(TimeSince(start), 1000);
-}
-
-// Test that MacCarbonSocketServer::Wakeup works as expected.
-TEST(MacCarbonSocketServerTest, TestWakeup) {
-  MacCarbonSocketServer server;
-  WakeThread thread(&server);
-  uint32_t start = Time();
-  thread.Start();
-  server.Wait(10000, true);
-  EXPECT_LT(TimeSince(start), 10000);
-}
-
-// Test that MacCarbonAppSocketServer::Wait works as expected.
-TEST(MacCarbonAppSocketServerTest, TestWait) {
-  MacCarbonAppSocketServer server;
-  uint32_t start = Time();
-  server.Wait(1000, true);
-  EXPECT_GE(TimeSince(start), 1000);
-}
-
-// Test that MacCarbonAppSocketServer::Wakeup works as expected.
-TEST(MacCarbonAppSocketServerTest, TestWakeup) {
-  MacCarbonAppSocketServer server;
-  WakeThread thread(&server);
-  uint32_t start = Time();
-  thread.Start();
-  server.Wait(10000, true);
-  EXPECT_LT(TimeSince(start), 10000);
-}
-
-#endif
-
 // Test that MacAsyncSocket passes all the generic Socket tests.
 class MacAsyncSocketTest : public SocketTest {
  protected:
   MacAsyncSocketTest()
       : server_(CreateSocketServer()),
         scope_(server_.get()) {}
   // Override for other implementations of MacBaseSocketServer.
   virtual MacBaseSocketServer* CreateSocketServer() {
     return new MacCFSocketServer();
   };
@@ skipping 111 matching lines @@
   SocketTest::TestUdpIPv6();
 }
 
 TEST_F(MacAsyncSocketTest, DISABLED_TestGetSetOptionsIPv4) {
   SocketTest::TestGetSetOptionsIPv4();
 }
 
 TEST_F(MacAsyncSocketTest, DISABLED_TestGetSetOptionsIPv6) {
   SocketTest::TestGetSetOptionsIPv6();
 }
-
-#ifndef CARBON_DEPRECATED
-class MacCarbonAppAsyncSocketTest : public MacAsyncSocketTest {
-  virtual MacBaseSocketServer* CreateSocketServer() {
-    return new MacCarbonAppSocketServer();
-  };
-};
-
-TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv4) {
-  SocketTest::TestSocketServerWaitIPv4();
-}
-
-TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv6) {
-  SocketTest::TestSocketServerWaitIPv6();
-}
-#endif
 }  // namespace rtc