Display status message for "Add snippets" on chrome://snippets-internals

components/ntp_snippets/ntp_snippets_fetcher.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 "components/ntp_snippets/ntp_snippets_fetcher.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 
 using net::URLFetcher;
 using net::URLRequestContextGetter;
 using net::HttpRequestHeaders;
 using net::URLRequestStatus;
 
 namespace ntp_snippets {
 
+namespace {
+
+const char kStatusMessageURLRequestErrorFormat[] = "URLRequestStatus error %d";
+const char kStatusMessageHTTPErrorFormat[] = "HTTP error %d";
+
+}  // namespace

[Bernhard Bauer, 2016/04/22 12:54:00]

If you use an anonymous namespace here, include the constants below as well.

[jkrcal, 2016/04/22 13:04:37]

Done.

+
 const char kContentSnippetsServerFormat[] =
     "https://chromereader-pa.googleapis.com/v1/fetch?key=%s";
 
 const char kRequestParameterFormat[] =
     "{"
     "  \"response_detail_level\": \"STANDARD\","
     "  \"advanced_options\": {"
     "    \"local_scoring_params\": {"
     "      \"content_params\": {"
     "        \"only_return_personalized_results\": false"
@@ skipping 66 matching lines @@
   // Try to make fetching the files bit more robust even with poor connection.
   url_fetcher_->SetMaxRetriesOn5xx(3);
   url_fetcher_->Start();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // URLFetcherDelegate overrides
 void NTPSnippetsFetcher::OnURLFetchComplete(const URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
 
+  std::string message;
   const URLRequestStatus& status = source->GetStatus();
   if (!status.is_success()) {
-    DLOG(WARNING) << "URLRequestStatus error " << status.error()
-                  << " while trying to download " << source->GetURL().spec();
-    return;
-  }
-
-  int response_code = source->GetResponseCode();
-  if (response_code != net::HTTP_OK) {
-    DLOG(WARNING) << "HTTP error " << response_code
-                  << " while trying to download " << source->GetURL().spec();
-    return;
+    message = base::StringPrintf(kStatusMessageURLRequestErrorFormat,
+                                 status.error());
+  } else if (source->GetResponseCode() != net::HTTP_OK) {
+    message = base::StringPrintf(kStatusMessageHTTPErrorFormat,
+                                 source->GetResponseCode());
   }
 
   std::string response;
-  bool stores_result_to_string = source->GetResponseAsString(&response);
-  DCHECK(stores_result_to_string);
+  if (!message.empty()) {
+    DLOG(WARNING) << message << " while trying to download "
+                  << source->GetURL().spec();
 
-  callback_list_.Notify(response);
+  } else {
+    bool stores_result_to_string = source->GetResponseAsString(&response);
+    DCHECK(stores_result_to_string);
+  }
+
+  callback_list_.Notify(response, message);
 }
 
 }  // namespace ntp_snippets