Change the way that gzipped resources are loaded from resources.pak

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 40 matching lines @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/accessibility_browser_test_utils.h"
 #include "net/base/filename_util.h"
 #include "net/cookies/cookie_store.h"
+#include "net/filter/filter.h"
+#include "net/filter/gzip_header.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/test/python_utils.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 297 matching lines @@
   // NavigationThrottle:
   NavigationThrottle::ThrottleCheckResult WillStartRequest() override {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             on_will_start_request_closure_);
     return NavigationThrottle::DEFER;
   }
 
   base::Closure on_will_start_request_closure_;
 };
 
+bool HasGzipHeader(const base::RefCountedMemory& maybe_gzipped) {
+  net::GZipHeader header;
+  net::GZipHeader::Status header_status = net::GZipHeader::INCOMPLETE_HEADER;
+  // TODO(dbeam): why do we even have this lever^Wparameter?

[mmenke, 2016/08/18 14:40:35]

^W?

I assume it's so ReadMore can continue where it left off.  See 
GZipFilter::CheckGZipHeader -> GZipFilter::DoInflate

[Dan Beam, 2016/08/18 20:56:50]

means "remove word"
https://en.wikipedia.org/wiki/Backspace#.5EW_and_.5EU
ah, i understand now.  comment removed

+  const char* header_end = NULL;

[mmenke, 2016/08/18 14:40:36]

nullptr

[Dan Beam, 2016/08/18 20:56:50]

Done.

+  while (header_status == net::GZipHeader::INCOMPLETE_HEADER) {
+    header_status = header.ReadMore(maybe_gzipped.front_as<char>(),
+                                    maybe_gzipped.size(),
+                                    &header_end);
+  }
+  return header_status == net::GZipHeader::COMPLETE_HEADER;
+}
+
+void AppendGzippedResource(const base::RefCountedMemory& encoded,
+                           std::string* to_append) {
+  std::unique_ptr<net::Filter> filter = net::Filter::GZipFactory();

[mmenke, 2016/08/18 14:40:36]

Need to make net::Filter NET_EXPORT (It's NET_EXPORT_PRIVATE, currently)

[Dan Beam, 2016/08/18 20:56:50]

Done.

+  memcpy(filter->stream_buffer()->data(), encoded.front_as<char>(),
+         encoded.size());
+  filter->FlushStreamBuffer(encoded.size());
+
+  const int kBufferSize = 4096;
+  char dest_buffer[kBufferSize];
+
+  net::Filter::FilterStatus status;
+  do {
+    int read_size = kBufferSize;
+    status = filter->ReadData(dest_buffer, &read_size);
+    ASSERT_NE(status, net::Filter::FILTER_ERROR);
+    to_append->append(dest_buffer, read_size);
+  } while (status != net::Filter::FILTER_DONE);
+}
+
 }  // namespace
 
 bool NavigateIframeToURL(WebContents* web_contents,
                          std::string iframe_id,
                          const GURL& url) {
   std::string script = base::StringPrintf(
       "setTimeout(\""
       "var iframes = document.getElementById('%s');iframes.src='%s';"
       "\",0)",
       iframe_id.c_str(), url.spec().c_str());
@@ skipping 449 matching lines @@
   // Inject WebUI test runner script first prior to other scripts required to
   // run the test as scripts may depend on it being declared.
   std::vector<int> ids;
   ids.push_back(IDR_WEBUI_JS_WEBUI_RESOURCE_TEST);
   ids.insert(ids.end(), js_resource_ids.begin(), js_resource_ids.end());
 
   std::string script;
   for (std::vector<int>::iterator iter = ids.begin();
        iter != ids.end();
        ++iter) {
-    scoped_refptr<base::RefCountedMemory> resource =
+    scoped_refptr<base::RefCountedMemory> bytes =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytes(*iter);
-    script.append(resource->front_as<char>(), resource->size());
+
+    if (HasGzipHeader(*bytes))
+      AppendGzippedResource(*bytes, &script);
+    else
+      script.append(bytes->front_as<char>(), bytes->size());
+
     script.append("\n");
   }
   if (!ExecuteScript(web_contents, script))
     return false;
 
   DOMMessageQueue message_queue;
   if (!ExecuteScript(web_contents, "runTests()"))
     return false;
 
   std::string message;
@@ skipping 791 matching lines @@
 
 bool TestNavigationManager::ShouldMonitorNavigation(NavigationHandle* handle) {
   if (handle_ || handle->GetURL() != url_)
     return false;
   if (handled_navigation_)
     return false;
   return true;
 }
 
 }  // namespace content