Rename NetLogLogger and CapturingNetLog

extensions/browser/api/cast_channel/cast_channel_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/files/file_path.h"
 #include "base/timer/mock_timer.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/cast_channel/cast_channel_api.h"
 #include "extensions/browser/api/cast_channel/cast_socket.h"
 #include "extensions/browser/api/cast_channel/cast_test_util.h"
 #include "extensions/browser/api/cast_channel/logger.h"
 #include "extensions/common/api/cast_channel.h"
 #include "extensions/common/api/cast_channel/cast_channel.pb.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/test_util.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "net/log/capturing_net_log.h"
+#include "net/log/test_net_log.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
 
 // TODO(mfoltz): Mock out the ApiResourceManager to resolve threading issues
 // (crbug.com/398242) and simulate unloading of the extension.
 
 namespace cast_channel = extensions::core_api::cast_channel;
 using cast_channel::CastMessage;
 using cast_channel::CastSocket;
 using cast_channel::CastTransport;
@@ skipping 188 matching lines @@
             new extensions::CastChannelSetAuthorityKeysFunction;
     cast_channel_set_authority_keys_function->set_extension(extension.get());
     return cast_channel_set_authority_keys_function;
   }
 
   MockCastSocket* mock_cast_socket_;
   base::MockTimer* timeout_timer_;
   net::IPEndPoint ip_endpoint_;
   LastErrors last_errors_;
   CastTransport::Delegate* message_delegate_;
-  net::CapturingNetLog capturing_net_log_;
+  net::TestNetLog capturing_net_log_;
   int channel_id_;
 };
 
 ACTION_P2(InvokeDelegateOnError, api_test, api) {
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&CastChannelAPITest::DoCallOnError, base::Unretained(api_test),
                  base::Unretained(api)));
 }
 
@@ skipping 363 matching lines @@
 #define MAYBE_TestSetAuthorityKeys DISABLED_TestSetAuthorityKeys
 #else
 #define MAYBE_TestSetAuthorityKeys TestSetAuthorityKeys
 #endif
 // Test loading extension, opening a channel with ConnectInfo, adding a
 // listener, writing, reading, and closing.
 IN_PROC_BROWSER_TEST_F(CastChannelAPITest, MAYBE_TestSetAuthorityKeys) {
   EXPECT_TRUE(
       RunExtensionSubtest("cast_channel/api", "test_authority_keys.html"));
 }