Remove CreateEmptyExtension from extension_function_test_utils

chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc

 // Copyright 2013 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/json/json_writer.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/webrtc_log_uploader.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
+#include "extensions/common/test_util.h"
 
 using extensions::Extension;
 
 namespace utils = extension_function_test_utils;
 
 namespace {
 
 static const char kTestLoggingSessionId[] = "0123456789abcdef";
 static const char kTestLoggingUrl[] = "dummy url string";
 
 class WebrtcLoggingPrivateApiTest : public ExtensionApiTest {
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(WebrtcLoggingPrivateApiTest, TestStartStopDiscard) {
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
+  scoped_refptr<Extension> empty_extension(
+      extensions::test_util::CreateEmptyExtension());
 
   // Tell the uploader to save the multipart to a buffer instead of uploading.
   std::string multipart;
   g_browser_process->webrtc_log_uploader()->
       OverrideUploadWithBufferForTesting(&multipart);
 
   // Start
 
   scoped_refptr<extensions::WebrtcLoggingPrivateStartFunction>
       start_function(new extensions::WebrtcLoggingPrivateStartFunction());
@@ skipping 70 matching lines @@
 //
 // http://127.0.0.1:43213/webrtc/webrtc_jsep01_test.html
 // ------**--yradnuoBgoLtrapitluMklaTelgooG--**----
 // Content-Disposition: form-data; name="webrtc_log"; filename="webrtc_log.gz"
 // Content-Type: application/gzip
 //
 // <compressed data (zip)>
 // ------**--yradnuoBgoLtrapitluMklaTelgooG--**------
 //
 IN_PROC_BROWSER_TEST_F(WebrtcLoggingPrivateApiTest, TestStartStopUpload) {
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
+  scoped_refptr<Extension> empty_extension(
+      extensions::test_util::CreateEmptyExtension());
 
   // Tell the uploader to save the multipart to a buffer instead of uploading.
   std::string multipart;
   g_browser_process->webrtc_log_uploader()->
       OverrideUploadWithBufferForTesting(&multipart);
 
   // SetMetaData.
 
   scoped_refptr<extensions::WebrtcLoggingPrivateSetMetaDataFunction>
       set_meta_data_function(
@@ skipping 137 matching lines @@
   std::string final_delimiter = boundary;
   final_delimiter += "--";
   EXPECT_STREQ(final_delimiter.c_str(), multipart_lines[29].c_str());
   EXPECT_TRUE(multipart_lines[30].empty());
 
   g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting(
       NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcLoggingPrivateApiTest, TestStartStopRtpDump) {
-  scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
+  scoped_refptr<Extension> empty_extension(
+      extensions::test_util::CreateEmptyExtension());
 
   // Start RTP dump.
   scoped_refptr<extensions::WebrtcLoggingPrivateStartRtpDumpFunction>
       start_function(
           new extensions::WebrtcLoggingPrivateStartRtpDumpFunction());
   start_function->set_extension(empty_extension.get());
   start_function->set_has_callback(true);
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 12 matching lines @@
   // Stop RTP dump.
   scoped_refptr<extensions::WebrtcLoggingPrivateStopRtpDumpFunction>
       stop_function(new extensions::WebrtcLoggingPrivateStopRtpDumpFunction());
   stop_function->set_extension(empty_extension.get());
   stop_function->set_has_callback(true);
 
   result.reset(utils::RunFunctionAndReturnSingleResult(
       stop_function.get(), parameter_string, browser()));
   ASSERT_FALSE(result.get());
 }