Move google_streaming_api.proto to content/public/browser

This CL moves the google_streaming_api.proto from
content/browser/speech/proto to content/public/browser/proto. The proto
file is used by both content/browser/speech and chrome/services/speech.

Bug: 1094490
Change-Id: I2bbed933e4256cf0960b65b95a23a913aa6276d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2243714Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Evan Liu <evliu@google.com>
Cr-Commit-Position: refs/heads/master@{#779593}

chrome/services/speech/BUILD.gn

@@ -30,7 +30,7 @@ source_set("lib") {
     ":buildflags",
     "//base",
     "//components/speech",
-    "//content/browser/speech/proto",
+    "//content/public/browser:proto",
     "//mojo/public/cpp/bindings",
     "//net",
     "//services/network/public/cpp",
@@ -53,7 +53,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//chrome/test:test_support",
     "//components/speech",
-    "//content/browser/speech/proto",
+    "//content/public/browser:proto",
     "//testing/gmock",
     "//testing/gtest",
   ]

chrome/services/speech/DEPS

@@ -4,6 +4,7 @@ include_rules = [
   "+components/soda/constants.h",
   "+components/speech",
   "+content/browser/speech",
+  "+content/public/browser",
   "+google_apis",
   "+media",
   "+services/network",

chrome/services/speech/cloud_speech_recognition_client.cc

@@ -7,7 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "google_apis/google_api_keys.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "net/base/escape.h"

chrome/services/speech/cloud_speech_recognition_client_unittest.cc

@@ -18,7 +18,7 @@
 #include "base/time/time.h"
 #include "chrome/services/speech/speech_recognition_service_impl.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "content/public/test/browser_task_environment.h"
 #include "media/base/bind_to_current_loop.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"

content/browser/BUILD.gn

@@ -104,12 +104,12 @@ jumbo_source_set("browser") {
     "//content/browser/process_internals:mojo_bindings",
     "//content/browser/resources/media:media_internals_resources",
     "//content/browser/service_worker:service_worker_proto",
-    "//content/browser/speech/proto",
     "//content/browser/webrtc/resources",
     "//content/common",
     "//content/common:buildflags",
     "//content/common:mojo_bindings",
     "//content/public/app:service_manifests",
+    "//content/public/browser:proto",
     "//content/public/common:common_sources",
     "//content/public/common:content_descriptor_keys",
     "//crypto",

content/browser/speech/proto/BUILD.gn

-# 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.
-
-import("//third_party/protobuf/proto_library.gni")
-
-proto_library("proto") {
-  sources = [ "google_streaming_api.proto" ]
-}

content/browser/speech/speech_recognition_browsertest.cc

@@ -19,12 +19,12 @@
 #include "base/sys_byteorder.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test.h"

content/browser/speech/speech_recognition_engine.cc

@@ -15,7 +15,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/speech/audio_buffer.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "google_apis/google_api_keys.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"

content/browser/speech/speech_recognition_engine_unittest.cc

@@ -17,7 +17,7 @@
 #include "base/sys_byteorder.h"
 #include "base/test/task_environment.h"
 #include "content/browser/speech/audio_buffer.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"

content/browser/speech/speech_recognizer_impl_unittest.cc

@@ -18,9 +18,9 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/browser/speech/proto/google_streaming_api.pb.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/browser/speech/speech_recognizer_impl.h"
+#include "content/public/browser/google_streaming_api.pb.h"
 #include "content/public/browser/speech_recognition_event_listener.h"
 #include "content/public/common/content_features.h"
 #include "content/public/test/browser_task_environment.h"

content/public/browser/BUILD.gn

@@ -6,6 +6,7 @@ import("//build/config/jumbo.gni")
 import("//build/config/ui.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//ppapi/buildflags/buildflags.gni")
+import("//third_party/protobuf/proto_library.gni")
 import("//third_party/webrtc/webrtc.gni")
 
 if (is_android) {
@@ -539,3 +540,7 @@ if (is_android) {
     sources = [ "contacts_picker_properties_requested.h" ]
   }
 }
+
+proto_library("proto") {
+  sources = [ "google_streaming_api.proto" ]
+}

content/test/BUILD.gn

@@ -379,10 +379,10 @@ jumbo_static_library("test_support") {
     "//components/viz/host",
     "//content/app:for_content_tests",
     "//content/browser:for_content_tests",
-    "//content/browser/speech/proto",
     "//content/child:for_content_tests",
     "//content/gpu",
     "//content/public/browser",
+    "//content/public/browser:proto",
     "//content/public/child",
     "//content/public/common",
     "//content/public/common:client_hints_mojom",
@@ -1445,7 +1445,7 @@ test("content_browsertests") {
       "../browser/storage_service_sandbox_browsertest.cc",
       "../browser/zoom_browsertest.cc",
     ]
-    deps += [ "//content/browser/speech/proto" ]
+    deps += [ "//content/public/browser:proto" ]
   }
   if (is_posix) {
     deps += [ "//services/tracing:test_utils" ]
@@ -2112,11 +2112,11 @@ test("content_unittests") {
     "//content/browser/devtools:devtools_background_services_proto",
     "//content/browser/notifications:notification_proto",
     "//content/browser/service_worker:service_worker_proto",
-    "//content/browser/speech/proto",
     "//content/child:for_content_tests",
     "//content/common:buildflags",
     "//content/gpu",
     "//content/public/browser",
+    "//content/public/browser:proto",
     "//content/public/child",
     "//content/public/common",
     "//content/public/common:service_names",