Move Google search related util methods to page_load_metrics_util

chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h

Index: chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
index 2364e8b7205a93ae868bcdce8fc9bf938f4500c6..272126d8a3933d07afb2a0dd12945888c40b22bc 100644
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
@@ -96,30 +96,12 @@ class FromGWSPageLoadMetricsLogger {
       const page_load_metrics::PageLoadExtraInfo& extra_info);
 
   // The methods below are public only for testing.
-  static bool IsGoogleSearchHostname(const GURL& url);
-  static bool IsGoogleSearchResultUrl(const GURL& url);
-  static bool IsGoogleSearchRedirectorUrl(const GURL& url);
   bool ShouldLogFailedProvisionalLoadMetrics();
   bool ShouldLogPostCommitMetrics(const GURL& url);
   bool ShouldLogForegroundEventAfterCommit(
       const base::Optional<base::TimeDelta>& event,
       const page_load_metrics::PageLoadExtraInfo& info);
 
-  // Whether the given query string contains the given component. The query
-  // parameter should contain the query string of a URL (the portion following
-  // the question mark, excluding the question mark). The component must fully
-  // match a component in the query string. For example, 'foo=bar' would match
-  // the query string 'a=b&foo=bar&c=d' but would not match 'a=b&zzzfoo=bar&c=d'
-  // since, though foo=bar appears in the query string, the key specified in the
-  // component 'foo' does not match the full key in the query string
-  // 'zzzfoo'. For QueryContainsComponent, the component should of the form
-  // 'key=value'. For QueryContainsComponentPrefix, the component should be of
-  // the form 'key=' (where the value is not specified).
-  static bool QueryContainsComponent(const base::StringPiece query,
-                                     const base::StringPiece component);
-  static bool QueryContainsComponentPrefix(const base::StringPiece query,
-                                           const base::StringPiece component);
-
  private:
   bool previously_committed_url_is_search_results_ = false;
   bool previously_committed_url_is_search_redirector_ = false;
@@ -134,11 +116,6 @@ class FromGWSPageLoadMetricsLogger {
   // The time of first user interaction after paint from navigation start.
   base::Optional<base::TimeDelta> first_user_interaction_after_paint_;
 
-  // Common helper for QueryContainsComponent and QueryContainsComponentPrefix.
-  static bool QueryContainsComponentHelper(const base::StringPiece query,
-                                           const base::StringPiece component,
-                                           bool component_is_prefix);
-
   DISALLOW_COPY_AND_ASSIGN(FromGWSPageLoadMetricsLogger);
 };