[Code Health] Enable gn check for //chrome/services/speech

This required moving ChunkedByteBuffer to //components/speech to be
shared between //chrome and //content.

Bug: 949535
Change-Id: I0c58762bd4c47123f9c36778c3d02b8d2da65564
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533854Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Evan Liu <evliu@google.com>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826887}

.gn

@@ -77,7 +77,6 @@ no_check_targets = [
   "//chrome/services/cups_proxy:*",  # 6 errors
   "//chrome/services/ipp_parser:*",  # 1 error
   "//chrome/services/removable_storage_writer:*",  # 1 error
-  "//chrome/services/speech:*",  # 5 errors
   "//chrome/services/util_win:*",  # 1 error
   "//chrome/test/chromedriver:*",  # 115 errors
   "//chrome/test/data/nacl:*",  # 350 errors

chrome/services/speech/BUILD.gn

@@ -32,6 +32,8 @@ source_set("lib") {
     "//chrome/services/speech/soda",
     "//components/speech",
     "//content/public/browser:proto",
+    "//google_apis",
+    "//media/mojo/common",
     "//mojo/public/cpp/bindings",
     "//net",
     "//services/network/public/cpp",

chrome/services/speech/DEPS

 include_rules = [
   "+chrome/services/speech",
   "+components/speech",
-  "+content/browser/speech",
   "+content/public/browser",
   "+google_apis",
   "+media",
-  "+services/network",
+  "+services/network/public",
+  "+services/network/test",
   "+third_party/blink/public/mojom/speech",
 ]

chrome/services/speech/cloud_speech_recognition_client.h

@@ -11,11 +11,11 @@
 #include "base/strings/string_piece.h"
 #include "base/unguessable_token.h"
 #include "chrome/services/speech/speech_recognition_service_impl.h"
+#include "components/speech/chunked_byte_buffer.h"
 #include "components/speech/downstream_loader.h"
 #include "components/speech/downstream_loader_client.h"
 #include "components/speech/upstream_loader.h"
 #include "components/speech/upstream_loader_client.h"
-#include "content/browser/speech/chunked_byte_buffer.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 
 namespace speech {
@@ -108,7 +108,7 @@ class CloudSpeechRecognitionClient : public speech::UpstreamLoaderClient,
   mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_;
   base::WeakPtr<SpeechRecognitionServiceImpl> speech_recognition_service_impl_;
 
-  content::ChunkedByteBuffer chunked_byte_buffer_;
+  ChunkedByteBuffer chunked_byte_buffer_;
 };
 
 }  // namespace speech

chrome/services/speech/cloud_speech_recognition_client_unittest.cc

@@ -25,6 +25,7 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "net/http/http_util.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/test/test_url_loader_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/services/speech/speech_recognition_service_impl.h

@@ -11,7 +11,7 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
-#include "services/network/url_loader_factory.h"
+#include "services/network/public/mojom/url_loader_factory.mojom.h"
 
 namespace speech {
 

components/BUILD.gn

@@ -147,6 +147,7 @@ test("components_unittests") {
     "//components/signin/public/base:unit_tests",
     "//components/signin/public/identity_manager:unit_tests",
     "//components/signin/public/webdata:unit_tests",
+    "//components/speech:unit_tests",
     "//components/sqlite_proto:unit_tests",
     "//components/ssl_errors:unit_tests",
     "//components/subresource_filter/core/browser:unit_tests",

components/speech/BUILD.gn

@@ -4,6 +4,8 @@
 
 source_set("speech") {
   sources = [
+    "chunked_byte_buffer.cc",
+    "chunked_byte_buffer.h",
     "downstream_loader.cc",
     "downstream_loader.h",
     "downstream_loader_client.h",
@@ -20,3 +22,12 @@ source_set("speech") {
     "//services/network/public/mojom",
   ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "chunked_byte_buffer_unittest.cc" ]
+  deps = [
+    ":speech",
+    "//testing/gtest",
+  ]
+}

content/browser/speech/chunked_byte_buffer.cc → components/speech/chunked_byte_buffer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/speech/chunked_byte_buffer.h"
+#include "components/speech/chunked_byte_buffer.h"
 
 #include <algorithm>
 #include <utility>
@@ -20,12 +20,10 @@ static_assert(sizeof(size_t) >= kHeaderLength,
 
 }  // namespace
 
-namespace content {
+namespace speech {
 
 ChunkedByteBuffer::ChunkedByteBuffer()
-    : partial_chunk_(new Chunk()),
-      total_bytes_stored_(0) {
-}
+    : partial_chunk_(new Chunk()), total_bytes_stored_(0) {}
 
 ChunkedByteBuffer::~ChunkedByteBuffer() {
   Clear();
@@ -62,8 +60,7 @@ void ChunkedByteBuffer::Append(const uint8_t* start, size_t length) {
     DCHECK_GT(insert_length, 0U);
     DCHECK_LE(insert_length, remaining_bytes);
     DCHECK_LE(next_data + insert_length, start + length);
-    insert_target->insert(insert_target->end(),
-                          next_data,
+    insert_target->insert(insert_target->end(), next_data,
                           next_data + insert_length);
     next_data += insert_length;
     remaining_bytes -= insert_length;
@@ -99,7 +96,7 @@ bool ChunkedByteBuffer::HasChunks() const {
 
 std::unique_ptr<std::vector<uint8_t>> ChunkedByteBuffer::PopChunk() {
   if (chunks_.empty())
-    return std::unique_ptr<std::vector<uint8_t>>();
+    return nullptr;
   std::unique_ptr<Chunk> chunk = std::move(*chunks_.begin());
   chunks_.erase(chunks_.begin());
   DCHECK_EQ(chunk->header.size(), kHeaderLength);
@@ -117,8 +114,7 @@ void ChunkedByteBuffer::Clear() {
 
 ChunkedByteBuffer::Chunk::Chunk() : content(new std::vector<uint8_t>()) {}
 
-ChunkedByteBuffer::Chunk::~Chunk() {
-}
+ChunkedByteBuffer::Chunk::~Chunk() {}
 
 size_t ChunkedByteBuffer::Chunk::ExpectedContentLength() const {
   DCHECK_EQ(header.size(), kHeaderLength);
@@ -128,4 +124,4 @@ size_t ChunkedByteBuffer::Chunk::ExpectedContentLength() const {
   return static_cast<size_t>(content_length);
 }
 
-}  // namespace content
+}  // namespace speech

content/browser/speech/chunked_byte_buffer.h → components/speech/chunked_byte_buffer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_SPEECH_CHUNKED_BYTE_BUFFER_H_
-#define CONTENT_BROWSER_SPEECH_CHUNKED_BYTE_BUFFER_H_
+#ifndef COMPONENTS_SPEECH_CHUNKED_BYTE_BUFFER_H_
+#define COMPONENTS_SPEECH_CHUNKED_BYTE_BUFFER_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -14,9 +14,8 @@
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
-#include "content/common/content_export.h"
 
-namespace content {
+namespace speech {
 
 // Models a chunk-oriented byte buffer. The term chunk is herein defined as an
 // arbitrary sequence of bytes that is preceeded by N header bytes, indicating
@@ -28,7 +27,7 @@ namespace content {
 //
 // E.g. 00 00 00 04 xx xx xx xx 00 00 00 02 yy yy 00 00 00 04 zz zz zz zz
 //      [----- CHUNK 1 -------] [--- CHUNK 2 ---] [------ CHUNK 3 ------]
-class CONTENT_EXPORT ChunkedByteBuffer {
+class ChunkedByteBuffer {
  public:
   ChunkedByteBuffer();
   ~ChunkedByteBuffer();
@@ -72,7 +71,6 @@ class CONTENT_EXPORT ChunkedByteBuffer {
   DISALLOW_COPY_AND_ASSIGN(ChunkedByteBuffer);
 };
 
+}  // namespace speech
 
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_SPEECH_CHUNKED_BYTE_BUFFER_H_
+#endif  // COMPONENTS_SPEECH_CHUNKED_BYTE_BUFFER_H_

content/browser/speech/chunked_byte_buffer_unittest.cc → components/speech/chunked_byte_buffer_unittest.cc

@@ -7,10 +7,10 @@
 #include <string>
 #include <vector>
 
-#include "content/browser/speech/chunked_byte_buffer.h"
+#include "components/speech/chunked_byte_buffer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace content {
+namespace speech {
 
 typedef std::vector<uint8_t> ByteVector;
 
@@ -73,4 +73,4 @@ TEST(ChunkedByteBufferTest, BasicTest) {
   EXPECT_FALSE(buffer.HasChunks());
 }
 
-}  // namespace content
+}  // namespace speech

content/browser/BUILD.gn

@@ -2606,8 +2606,6 @@ source_set("browser") {
       "speech/audio_buffer.h",
       "speech/audio_encoder.cc",
       "speech/audio_encoder.h",
-      "speech/chunked_byte_buffer.cc",
-      "speech/chunked_byte_buffer.h",
       "speech/endpointer/endpointer.cc",
       "speech/endpointer/endpointer.h",
       "speech/endpointer/energy_endpointer.cc",

content/browser/speech/speech_recognition_engine.h

@@ -14,12 +14,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/sequence_checker.h"
 #include "base/strings/string_piece.h"
+#include "components/speech/chunked_byte_buffer.h"
 #include "components/speech/downstream_loader.h"
 #include "components/speech/downstream_loader_client.h"
 #include "components/speech/upstream_loader.h"
 #include "components/speech/upstream_loader_client.h"
 #include "content/browser/speech/audio_encoder.h"
-#include "content/browser/speech/chunked_byte_buffer.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/speech_recognition_session_preamble.h"
 #include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
@@ -218,7 +218,7 @@ class CONTENT_EXPORT SpeechRecognitionEngine
   const std::string accept_language_;
   std::unique_ptr<AudioEncoder> encoder_;
   std::unique_ptr<AudioEncoder> preamble_encoder_;
-  ChunkedByteBuffer chunked_byte_buffer_;
+  speech::ChunkedByteBuffer chunked_byte_buffer_;
   bool got_last_definitive_result_;
   bool is_dispatching_event_;
   bool use_framed_post_data_;

content/test/BUILD.gn

@@ -2449,7 +2449,6 @@ test("content_unittests") {
       "../browser/direct_sockets/direct_sockets_unittest.cc",
       "../browser/host_zoom_map_impl_unittest.cc",
       "../browser/serial/serial_unittest.cc",
-      "../browser/speech/chunked_byte_buffer_unittest.cc",
       "../browser/speech/endpointer/endpointer_unittest.cc",
       "../browser/speech/speech_recognition_engine_unittest.cc",
       "../browser/speech/speech_recognizer_impl_unittest.cc",