predictors: Replace deprecated TestBrowserThread by TestBrowserThreadBundle

chrome/browser/predictors/resource_prefetch_predictor_test_util.cc

 // Copyright 2016 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 "chrome/browser/predictors/resource_prefetch_predictor_test_util.h"
 
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 
 namespace predictors {
 
@@ skipping 39 matching lines @@
 }
 
 RedirectData CreateRedirectData(const std::string& primary_key,
                                 uint64_t last_visit_time) {
   RedirectData data;
   data.set_primary_key(primary_key);
   data.set_last_visit_time(last_visit_time);
   return data;
 }
 
-void PrintTo(const PrefetchData& data, ::std::ostream* os) {
-  *os << "[" << data.primary_key() << "," << data.last_visit_time() << "]\n";
-  for (const ResourceData& resource : data.resources()) {
-    *os << "\t\t";
-    PrintTo(resource, os);
-    *os << "\n";
-  }
+std::ostream& operator<<(std::ostream& os, const PrefetchData& data) {
+  os << "[" << data.primary_key() << "," << data.last_visit_time() << "]\n";
+  for (const ResourceData& resource : data.resources())
+    os << "\t\t" << resource << "\n";

[pasko, 2016/10/17 14:46:42]

nit: std::endl instead of '\n' for extra pretty on hypothetical Windows?

[alexilin, 2016/10/17 15:32:35]

Uh, I've thought that std::endl is kinda undesirable thing. I've heard that it's
slower than simple '\n'.

[pasko, 2016/10/17 16:09:19]

TIL:
1. std::endl also does flushing of the buffer
2. it would output '\r\n' on Windows only if the stream is a file that is open
in text mode.

So: std::endl sounds better in tests, where portability and flushing messages
ASAP is more important than speed.

+  return os;
 }
 
-void PrintTo(const ResourceData& resource, ::std::ostream* os) {
-  *os << "[" << resource.resource_url() << "," << resource.resource_type()
-      << "," << resource.number_of_hits() << "," << resource.number_of_misses()
-      << "," << resource.consecutive_misses() << ","
-      << resource.average_position() << "," << resource.priority() << ","
-      << resource.has_validators() << "," << resource.always_revalidate()
-      << "]";
+std::ostream& operator<<(std::ostream& os, const ResourceData& resource) {
+  return os << "[" << resource.resource_url() << "," << resource.resource_type()
+            << "," << resource.number_of_hits() << ","
+            << resource.number_of_misses() << ","
+            << resource.consecutive_misses() << ","
+            << resource.average_position() << "," << resource.priority() << ","
+            << resource.has_validators() << "," << resource.always_revalidate()
+            << "]";
 }
 
-void PrintTo(const RedirectData& data, ::std::ostream* os) {
-  *os << "[" << data.primary_key() << "," << data.last_visit_time() << "]\n";
-  for (const RedirectStat& redirect : data.redirect_endpoints()) {
-    *os << "\t\t";
-    PrintTo(redirect, os);
-    *os << "\n";
-  }
+std::ostream& operator<<(std::ostream& os, const RedirectData& data) {
+  os << "[" << data.primary_key() << "," << data.last_visit_time() << "]\n";
+  for (const RedirectStat& redirect : data.redirect_endpoints())
+    os << "\t\t" << redirect << os;

[alexilin, 2016/10/17 15:32:35]

oh, wow

[pasko, 2016/10/17 16:09:19]

:)

+  return os;
 }
 
-void PrintTo(const RedirectStat& redirect, ::std::ostream* os) {
-  *os << "[" << redirect.url() << "," << redirect.number_of_hits() << ","
-      << redirect.number_of_misses() << "," << redirect.consecutive_misses()
-      << "]";
+std::ostream& operator<<(std::ostream& os, const RedirectStat& redirect) {
+  return os << "[" << redirect.url() << "," << redirect.number_of_hits() << ","
+            << redirect.number_of_misses() << ","
+            << redirect.consecutive_misses() << "]";
 }
 
 bool operator==(const PrefetchData& lhs, const PrefetchData& rhs) {
   bool equal = lhs.primary_key() == rhs.primary_key() &&
                lhs.resources_size() == rhs.resources_size();
 
   if (!equal)
     return false;
 
   for (int i = 0; i < lhs.resources_size(); ++i)
@@ skipping 28 matching lines @@
 }
 
 bool operator==(const RedirectStat& lhs, const RedirectStat& rhs) {
   return lhs.url() == rhs.url() &&
          lhs.number_of_hits() == rhs.number_of_hits() &&
          lhs.number_of_misses() == rhs.number_of_misses() &&
          lhs.consecutive_misses() == rhs.consecutive_misses();
 }
 
 }  // namespace predictors