| Index: chrome/browser/browser_process_impl.h
|
| diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
|
| index 0729ca3b19471e3d5aafb0ef9018df4183a75afa..baa46e6848875bf3d72bb7d64c63d19ec8a7bb90 100644
|
| --- a/chrome/browser/browser_process_impl.h
|
| +++ b/chrome/browser/browser_process_impl.h
|
| @@ -23,7 +23,6 @@
|
|
|
| class ChromeChildProcessWatcher;
|
| class ChromeDeviceClient;
|
| -class ChromeNetLog;
|
| class ChromeResourceDispatcherHostDelegate;
|
| class RemoteDebuggingServer;
|
| class PrefRegistrySimple;
|
| @@ -45,6 +44,10 @@ namespace gcm {
|
| class GCMDriver;
|
| }
|
|
|
| +namespace net_log {
|
| +class ChromeNetLog;
|
| +}
|
| +
|
| namespace policy {
|
| class BrowserPolicyConnector;
|
| class PolicyService;
|
| @@ -128,7 +131,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
| void StartAutoupdateTimer() override;
|
| #endif
|
|
|
| - ChromeNetLog* net_log() override;
|
| + net_log::ChromeNetLog* net_log() override;
|
| component_updater::ComponentUpdateService* component_updater() override;
|
| CRLSetFetcher* crl_set_fetcher() override;
|
| component_updater::PnaclComponentInstaller* pnacl_component_installer()
|
| @@ -260,7 +263,7 @@ class BrowserProcessImpl : public BrowserProcess,
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
| // Lives here so can safely log events on shutdown.
|
| - scoped_ptr<ChromeNetLog> net_log_;
|
| + scoped_ptr<net_log::ChromeNetLog> net_log_;
|
|
|
| scoped_ptr<ChromeResourceDispatcherHostDelegate>
|
| resource_dispatcher_host_delegate_;
|
|
|