Update brotli to v1.0.0-snapshot.

chrome/browser/ui/webui/about_ui.cc

 // Copyright (c) 2012 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/ui/webui/about_ui.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
+#include <brotli/decode.h>

[msw, 2016/11/29 19:28:40]

Why change the include type? Is this common for third-party headers?

[eustas, 2016/11/29 23:19:22]

Brotli API headers refer each other in a "system include" way. I suppose that
clients should do the same for consistency.

[msw, 2016/11/29 23:35:59]

I'm not sure if that's true; really, I just don't know.

[Kunihiko Sakamoto, 2016/11/30 06:17:31]

It seems #include "third_party/..." style is more common in Chromium.
Including with explicit third_party/ path is easier to follow too, IMO.

chromium/src$ git grep '<zlib.h>' |grep -v '^third_party/' |wc
      2       4     141
chromium/src$ git grep '"third_party/zlib/zlib.h"' |grep -v '^third_party/' |wc
     36      72    2795

[eustas, 2016/12/02 11:49:42]

Fixed

 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
@@ skipping 36 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/process_type.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
-#include "third_party/brotli/dec/decode.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_source.h"
 #endif
 
@@ skipping 679 matching lines @@
     if (path == kCreditsJsPath)
       idr = IDR_ABOUT_UI_CREDITS_JS;
 #if defined(OS_CHROMEOS)
     else if (path == kKeyboardUtilsPath)
       idr = IDR_KEYBOARD_UTILS_JS;
 #endif
 
     base::StringPiece raw_response =
         ResourceBundle::GetSharedInstance().GetRawDataResource(idr);
     if (idr == IDR_ABOUT_UI_CREDITS_HTML) {
-      size_t decoded_size;
-      const uint8_t* encoded_response_buffer =
-          reinterpret_cast<const uint8_t*>(raw_response.data());
-      CHECK(BrotliDecompressedSize(raw_response.size(), encoded_response_buffer,
-                                   &decoded_size));
-
-      // Resizing the response and using it as the buffer Brotli decompresses
-      // into.
-      response.resize(decoded_size);
-      CHECK(BrotliDecompressBuffer(raw_response.size(), encoded_response_buffer,
-                                   &decoded_size,
-                                   reinterpret_cast<uint8_t*>(&response[0])) ==
-            BROTLI_RESULT_SUCCESS);
+      const uint8_t* in = reinterpret_cast<const uint8_t*>(raw_response.data());
+      size_t available_in = raw_response.size();
+      BrotliDecoderState* decoder = BrotliDecoderCreateInstance(0, 0, 0);

[msw, 2016/11/29 19:28:40]

Someone familiar with Brotli should probably review this CL before misc OWNERS.

[eustas, 2016/11/29 23:19:22]

FWIW, I develop and support Brotli last 20 months.

[msw, 2016/11/29 23:35:59]

That doesn't qualify me to review your changes in Chromium :)

[eustas, 2016/12/02 11:49:42]

It might be difficult to find the right person.
We should ask net/ developers to take a look.

+      CHECK(!!decoder);
+      while (!BrotliDecoderIsFinished(decoder)) {
+        size_t available_out = 0;
+        CHECK(BrotliDecoderDecompressStream(decoder, &available_in, &in,
+                                            &available_out, 0,
+                                            0) != BROTLI_DECODER_RESULT_ERROR);
+        const uint8_t* out = BrotliDecoderTakeOutput(decoder, &available_out);
+        response.insert(response.end(), out, out + available_out);
+      }
+      BrotliDecoderDestroyInstance(decoder);
     } else {
       response = raw_response.as_string();
     }
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   } else if (source_name_ == chrome::kChromeUIDiscardsHost) {
     response = AboutDiscards(path);
 #endif
   } else if (source_name_ == chrome::kChromeUIDNSHost) {
     AboutDnsHandler::Start(profile(), callback);
     return;
@@ skipping 66 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
 
 #if defined(ENABLE_THEMES)
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
 }