Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: extensions/shell/browser/shell_url_request_context_getter.h

Issue 631203003: Fix bug: AppShell: CHECK failure in PeerConnection init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/shell/browser/shell_url_request_context_getter.h
diff --git a/extensions/browser/extension_url_request_context_getter.h b/extensions/shell/browser/shell_url_request_context_getter.h
similarity index 34%
rename from extensions/browser/extension_url_request_context_getter.h
rename to extensions/shell/browser/shell_url_request_context_getter.h
index b0cc68f7a38467020f37807bb2e80eb10e749432..7926ade9e510892bc675cdb661d2c04f2defc474 100644
--- a/extensions/browser/extension_url_request_context_getter.h
+++ b/extensions/shell/browser/shell_url_request_context_getter.h
@@ -2,35 +2,34 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_
-#define EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_
+#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
+#define EXTENSIONS_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
#include "base/files/file_path.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/content_browser_client.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "net/url_request/url_request_job_factory.h"
+#include "content/shell/browser/shell_url_request_context_getter.h"
namespace base {
class MessageLoop;
}
+namespace content {
+class BrowserContext;
+}
+
namespace net {
class NetworkDelegate;
class NetLog;
-class ProxyConfigService;
-class URLRequestContextStorage;
}
namespace extensions {
class InfoMap;
-class ExtensionURLRequestContextGetter : public net::URLRequestContextGetter {
+class ShellURLRequestContextGetter :
+ public content::ShellURLRequestContextGetter {
public:
- explicit ExtensionURLRequestContextGetter(
- void* browser_context,
+ ShellURLRequestContextGetter(
+ content::BrowserContext* browser_context,
bool ignore_certificate_errors,
const base::FilePath& base_path,
base::MessageLoop* io_loop,
@@ -40,33 +39,20 @@ class ExtensionURLRequestContextGetter : public net::URLRequestContextGetter {
net::NetLog* net_log,
InfoMap* extension_info_map);
- // net::URLRequestContextGetter implementation.
- virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
- virtual scoped_refptr<base::SingleThreadTaskRunner>
- GetNetworkTaskRunner() const OVERRIDE;
+ // content::ShellURLRequestContextGetter implementation.
+ virtual net::NetworkDelegate* CreateNetworkDelegate() override;
protected:
- virtual ~ExtensionURLRequestContextGetter();
+ virtual ~ShellURLRequestContextGetter();
+
private:
- void* browser_context_;
- bool ignore_certificate_errors_;
- base::FilePath base_path_;
- base::MessageLoop* io_loop_;
- base::MessageLoop* file_loop_;
- net::NetLog* net_log_;
+ content::BrowserContext* browser_context_;
InfoMap* extension_info_map_;
- scoped_ptr<net::ProxyConfigService> proxy_config_service_;
- scoped_ptr<net::NetworkDelegate> network_delegate_;
- scoped_ptr<net::URLRequestContextStorage> storage_;
- scoped_ptr<net::URLRequestContext> url_request_context_;
- content::ProtocolHandlerMap protocol_handlers_;
- content::URLRequestInterceptorScopedVector request_interceptors_;
-
private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionURLRequestContextGetter);
+ DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter);
};
} // namespace extensions
-#endif // EXTENSIONS_BROWSER_EXTENSION_URL_REQUEST_CONTEXT_GETTER_H_
+#endif // EXTENSIONS_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
« no previous file with comments | « extensions/shell/browser/shell_network_delegate.cc ('k') | extensions/shell/browser/shell_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698