commit c30f82130e239dbf7aab463579c2bfd1d8b2becd
author Alex Vakulenko <avakulenko@chromium.org> Tue Jul 22 07:27:22 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 22 22:02:59 2014 +0000
tree 64237ff07ae5b99b5268c30d50ece4e5edcbc932
parent 7c36b675537e3c16fa7c27d8f82100126ae84af2

buffet: extract useful error code definitionss into a separate file

Moved json parser error information from http_utils into its own
file, error_codes.h/.cc, where all future common error codes would
go.

BUG=None
TEST=USE=buffet P2_TEST_FILTER="buffet::*" FEATURES=test emerge-link platform2

Change-Id: Ie5457cedc248612ab512a7161b1fc2cb75758ac5
Reviewed-on: https://chromium-review.googlesource.com/209248
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/http_utils.cc

diff --git a/buffet/http_utils.cc b/buffet/http_utils.cc
index f7f1190..3924505 100644
--- a/buffet/http_utils.cc
+++ b/buffet/http_utils.cc
@@ -10,14 +10,13 @@
 #include <base/json/json_writer.h>
 #include <base/values.h>
 
-#include "buffet/mime_utils.h"
 #include "buffet/data_encoding.h"
+#include "buffet/error_codes.h"
+#include "buffet/mime_utils.h"
 
 namespace buffet {
 namespace http {
 
-const char kErrorDomainJSON[] = "json_parser";
-
 std::unique_ptr<Response> Get(const std::string& url,
                               const HeaderList& headers,
                               std::shared_ptr<Transport> transport,
@@ -140,7 +139,7 @@
   auto content_type = mime::RemoveParameters(response->GetContentType());
   if (content_type != mime::application::kJson &&
       content_type != mime::text::kPlain) {
-    Error::AddTo(error, kErrorDomainJSON, "non_json_content_type",
+    Error::AddTo(error, errors::json::kDomain, "non_json_content_type",
                  "Unexpected response content type: " + content_type);
     return std::unique_ptr<base::DictionaryValue>();
   }
@@ -150,13 +149,14 @@
   base::Value* value = base::JSONReader::ReadAndReturnError(
       json, base::JSON_PARSE_RFC, nullptr, &error_message);
   if (!value) {
-    Error::AddTo(error, kErrorDomainJSON, "json_parse_error", error_message);
+    Error::AddTo(error, errors::json::kDomain, errors::json::kParseError,
+                 error_message);
     return std::unique_ptr<base::DictionaryValue>();
   }
   base::DictionaryValue* dict_value = nullptr;
   if (!value->GetAsDictionary(&dict_value)) {
     delete value;
-    Error::AddTo(error, kErrorDomainJSON, "json_object_error",
+    Error::AddTo(error, errors::json::kDomain, errors::json::kObjectExpected,
                  "Response is not a valid JSON object");
     return std::unique_ptr<base::DictionaryValue>();
   }