Network traffic annotation added to speech_recognition_engine.

content/browser/speech/speech_recognition_engine.cc

 // Copyright (c) 2012 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 "content/browser/speech/speech_recognition_engine.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/big_endian.h"
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #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/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/http_user_agent_settings.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using net::URLFetcher;
 
 namespace content {
 namespace {
@@ skipping 296 matching lines @@
   // Setup downstream fetcher.
   std::vector<std::string> downstream_args;
   downstream_args.push_back(
       "key=" + net::EscapeQueryParamValue(google_apis::GetAPIKey(), true));
   downstream_args.push_back("pair=" + request_key);
   downstream_args.push_back("output=pb");
   GURL downstream_url(std::string(kWebServiceBaseUrl) +
                       std::string(kDownstreamUrl) +
                       base::JoinString(downstream_args, "&"));
 
-  downstream_fetcher_ = URLFetcher::Create(
-      kDownstreamUrlFetcherIdForTesting, downstream_url, URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag downstream_traffic_annotation =

[Henrik Grunell, 2017/05/09 08:27:11]

Oh, I wrote the upstream text here. Please change the upstream annotation below
to these texts. I'll provide downstream texts after that.

[Ramin Halavati, 2017/05/09 08:37:18]

Done, I will copy it here to make it easier for next suggestions.

+      net::DefineNetworkTrafficAnnotation("...", R"(

[Henrik Grunell, 2017/05/09 08:27:11]

"speech_recognition"

[Ramin Halavati, 2017/05/09 08:37:18]

Done.

+        semantics {
+          sender: "..."

[Henrik Grunell, 2017/05/09 08:27:11]

"Speech Recognition"

[Ramin Halavati, 2017/05/09 08:37:17]

Done.

+          description: "..."

[Henrik Grunell, 2017/05/09 08:27:11]

"Chromium provides translation from speech audio recorded with a microphone to
text, by using the Google speech recognition web service. Audio is sent to
Google's servers and text is returned."

[Ramin Halavati, 2017/05/09 08:37:18]

Done.

+          trigger: "..."

[Henrik Grunell, 2017/05/09 08:27:11]

This needs to be expanded and clarified.

[Henrik Grunell, 2017/05/09 08:27:11]

"The user chooses to start the recognition by clicking the microphone icon in
the Google search field."

+          data: "..."

[Henrik Grunell, 2017/05/09 08:27:11]

"Audio recorded with a microphone."

[Henrik Grunell, 2017/05/09 08:27:11]

How much data is recorded?

+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER

[Henrik Grunell, 2017/05/09 08:27:11]

GOOGLE_OWNED_SERVICE

[Ramin Halavati, 2017/05/09 08:37:18]

Done.

+        }
+        policy {
+          cookies_allowed: false

[Henrik Grunell, 2017/05/09 08:27:11]

I don't know, but guess false.

Tommi?

[Ramin Halavati, 2017/05/09 08:37:17]

They are disabled in line 365.

+          setting: "..."

[Henrik Grunell, 2017/05/09 08:27:12]

"The user must allow the browser to access the microphone in a popup
notification. This is set per site (hostname pattern). In the content settings,
microphone access can be turned off for all sites and site specific settings can
be changed."

[Ramin Halavati, 2017/05/09 08:37:17]

Done.

+          chrome_policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)
+            }
+          }
+          policy_exception_justification: "..."

[Henrik Grunell, 2017/05/09 08:27:11]

No policy is implemented.

[Ramin Halavati, 2017/05/09 08:37:18]

Done.

+        })");
+  downstream_fetcher_ =
+      URLFetcher::Create(kDownstreamUrlFetcherIdForTesting, downstream_url,
+                         URLFetcher::GET, this, downstream_traffic_annotation);
   downstream_fetcher_->SetRequestContext(url_context_.get());
   downstream_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                     net::LOAD_DO_NOT_SEND_COOKIES |
                                     net::LOAD_DO_NOT_SEND_AUTH_DATA);
   downstream_fetcher_->Start();
 
   // Setup upstream fetcher.
   // TODO(hans): Support for user-selected grammars.
   std::vector<std::string> upstream_args;
   upstream_args.push_back("key=" +
@@ skipping 34 matching lines @@
     if (preamble_encoder_)
       audio_format = preamble_encoder_->GetMimeType() + ",";
     audio_format += encoder_->GetMimeType();
     upstream_args.push_back(
         "audioFormat=" + net::EscapeQueryParamValue(audio_format, true));
   }
   GURL upstream_url(std::string(kWebServiceBaseUrl) +
                     std::string(kUpstreamUrl) +
                     base::JoinString(upstream_args, "&"));
 
-  upstream_fetcher_ = URLFetcher::Create(kUpstreamUrlFetcherIdForTesting,
-                                         upstream_url, URLFetcher::POST, this);
+  net::NetworkTrafficAnnotationTag upstream_traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("...", R"(
+        semantics {
+          sender: "..."
+          description: "..."
+          trigger: "..."
+          data: "..."
+          destination: WEBSITE/GOOGLE_OWNED_SERVICE/OTHER
+        }
+        policy {
+          cookies_allowed: false
+          setting: "..."
+          chrome_policy {
+            [POLICY_NAME] {
+              policy_options {mode: MANDATORY/RECOMMENDED/UNSET}
+              [POLICY_NAME]: ... //(value to disable it)
+            }
+          }
+          policy_exception_justification: "..."
+        })");
+  upstream_fetcher_ =
+      URLFetcher::Create(kUpstreamUrlFetcherIdForTesting, upstream_url,
+                         URLFetcher::POST, this, upstream_traffic_annotation);
   if (use_framed_post_data_)
     upstream_fetcher_->SetChunkedUpload("application/octet-stream");
   else
     upstream_fetcher_->SetChunkedUpload(encoder_->GetMimeType());
   upstream_fetcher_->SetRequestContext(url_context_.get());
   upstream_fetcher_->SetReferrer(config_.origin_url);
   upstream_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                   net::LOAD_DO_NOT_SEND_COOKIES |
                                   net::LOAD_DO_NOT_SEND_AUTH_DATA);
   upstream_fetcher_->Start();
@@ skipping 235 matching lines @@
 }
 
 SpeechRecognitionEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value) {
 }
 
 SpeechRecognitionEngine::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace content