OneGoogleBarFetcher: replace cmdline flags with feature params

chrome/browser/search/one_google_bar/one_google_bar_fetcher_impl.cc

 // Copyright 2017 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/search/one_google_bar/one_google_bar_fetcher_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
+#include "base/metrics/field_trial_params.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search/one_google_bar/one_google_bar_data.h"
 #include "chrome/common/chrome_content_client.h"
+#include "chrome/common/chrome_features.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "components/signin/core/browser/access_token_fetcher.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 154 matching lines @@
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(kApiScope);
   token_fetcher_ = base::MakeUnique<AccessTokenFetcher>(
       "one_google", signin_manager_, token_service_, scopes,
       base::BindOnce(&AuthenticatedURLFetcher::GotAccessToken,
                      base::Unretained(this)));
 }
 
 GURL OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetApiUrl(
     bool use_oauth) const {
-  std::string api_url(kApiUrl);
-  // TODO(treib): Attach to feature instead of cmdline.
-  base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
-  if (cmdline->HasSwitch("one-google-api-url"))
-    api_url = cmdline->GetSwitchValueASCII("one-google-api-url");
+  std::string api_url = base::GetFieldTrialParamValueByFeature(
+      features::kOneGoogleBarOnLocalNtp, "one-google-api-url");
+  if (api_url.empty()) {
+    api_url = kApiUrl;
+  }
+
   // Append the API key only for unauthenticated requests.
   if (!use_oauth) {
     api_url +=
         base::StringPrintf(kApiKeyFormat, google_apis::GetAPIKey().c_str());
   }
 
   return GURL(api_url);
 }
 
 std::string OneGoogleBarFetcherImpl::AuthenticatedURLFetcher::GetRequestBody()
     const {
-  // TODO(treib): Attach to feature instead of cmdline.
-  base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
-  if (cmdline->HasSwitch("one-google-bar-options"))
-    return cmdline->GetSwitchValueASCII("one-google-bar-options");
+  std::string override_options = base::GetFieldTrialParamValueByFeature(
+      features::kOneGoogleBarOnLocalNtp, "one-google-bar-options");
+  if (!override_options.empty()) {
+    return override_options;
+  }
 
   base::DictionaryValue dict;
   dict.SetInteger("subproduct", 243);
   dict.SetBoolean("enable_multilogin", true);
   dict.SetString("user_agent", GetUserAgent());
   dict.SetString("accept_language", g_browser_process->GetApplicationLocale());
   dict.SetString("original_request_url", google_base_url_.spec());
   auto material_options_dict = base::MakeUnique<base::DictionaryValue>();
   material_options_dict->SetString("page_title", " ");
   material_options_dict->SetBoolean("position_fixed", true);
@@ skipping 72 matching lines @@
 
 OneGoogleBarFetcherImpl::~OneGoogleBarFetcherImpl() = default;
 
 void OneGoogleBarFetcherImpl::Fetch(OneGoogleCallback callback) {
   callbacks_.push_back(std::move(callback));
   IssueRequestIfNoneOngoing();
 }
 
 void OneGoogleBarFetcherImpl::IssueRequestIfNoneOngoing() {
   // If there is an ongoing request, let it complete.
-  if (pending_request_.get())
+  if (pending_request_.get()) {
     return;
+  }
 
   pending_request_ = base::MakeUnique<AuthenticatedURLFetcher>(
       signin_manager_, token_service_, request_context_,
       google_url_tracker_->google_url(),
       base::BindOnce(&OneGoogleBarFetcherImpl::FetchDone,
                      base::Unretained(this)));
   pending_request_->Start();
 }
 
 void OneGoogleBarFetcherImpl::FetchDone(const net::URLFetcher* source) {
@@ skipping 47 matching lines @@
   Respond(base::nullopt);
 }
 
 void OneGoogleBarFetcherImpl::Respond(
     const base::Optional<OneGoogleBarData>& data) {
   for (auto& callback : callbacks_) {
     std::move(callback).Run(data);
   }
   callbacks_.clear();
 }