Index: android_webview/browser/aw_browser_main_parts.cc |
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc |
index 5f81da86c4692e4038b1a295b97f6e8a25dc8bb8..da8c3b9c40ac780667f5684e71290882307ee1c2 100644 |
--- a/android_webview/browser/aw_browser_main_parts.cc |
+++ b/android_webview/browser/aw_browser_main_parts.cc |
@@ -15,6 +15,7 @@ |
#include "content/public/common/result_codes.h" |
#include "net/android/network_change_notifier_factory_android.h" |
#include "net/base/network_change_notifier.h" |
+#include "net/http/http_stream_factory.h" |
#include "ui/base/l10n/l10n_util_android.h" |
#include "ui/base/layout.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -59,6 +60,8 @@ int AwBrowserMainParts::PreCreateThreads() { |
void AwBrowserMainParts::PreMainMessageLoopRun() { |
browser_context_->PreMainMessageLoopRun(); |
+ // TODO(sgurun) remove once crbug.com/329681 is fixed. |
+ net::HttpStreamFactory::EnableNpnSpdy31(); |
boliu
2013/12/19 00:46:51
Can this live somewhere in aw_url_request_context_
sgurun-gerrit only
2013/12/19 01:54:14
Done.
|
} |
bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) { |