Fix lifecycle of data reduction proxy objects in profile io data.

Fix lifecycle of data reduction proxy objects in profile io data.

Move data_reduction_proxy_* field declarations from profile_impl_io_data.h
to profile_io_data.h, before chrome_network_delegate. This guarantees
that chrome_network_delegate is destroyed before the data reduction
proxy objects.

BUG=414806
Committed: https://chromium.googlesource.com/chromium/src/+/d463f6b84e8a56d44904ec1418c99d7b47ea26dc

Committed: https://crrev.com/889c8b8598637539c79b11a4b5ddd130ca576fba
Cr-Commit-Position: refs/heads/master@{#296026}

[Not at Google. Contact bengr, 2014-09-17 20:55:15]

kundaji@chromium.org changed reviewers:
+ mmenke@chromium.org

[Not at Google. Contact bengr, 2014-09-17 20:56:09]

mmenke:
  chrome/browser/profiles/profile_impl_io_data.cc
  chrome/browser/profiles/profile_impl_io_data.h
  chrome/browser/profiles/profile_io_data.h

[mmenke, 2014-09-18 15:02:37]

On 2014/09/17 20:56:09, kundaji wrote:
> mmenke:
>   chrome/browser/profiles/profile_impl_io_data.cc
>   chrome/browser/profiles/profile_impl_io_data.h
>   chrome/browser/profiles/profile_io_data.h

I'm concerned about this being a more general problem - ProfileImplIOData owns
some other objects that are used by ProfileIOData or its URLRequestContexts as
well.  I'd really like to try and come up with a more general solution to this. 
If I don't come up with anything today or tomorrow, let's go ahead with this CL,
as a stopgap measure.

[mmenke, 2014-09-18 15:19:26]

On 2014/09/18 15:02:37, mmenke wrote:
> On 2014/09/17 20:56:09, kundaji wrote:
> > mmenke:
> >   chrome/browser/profiles/profile_impl_io_data.cc
> >   chrome/browser/profiles/profile_impl_io_data.h
> >   chrome/browser/profiles/profile_io_data.h
> 
> I'm concerned about this being a more general problem - ProfileImplIOData owns
> some other objects that are used by ProfileIOData or its URLRequestContexts as
> well.  I'd really like to try and come up with a more general solution to
this. 
> If I don't come up with anything today or tomorrow, let's go ahead with this
CL,
> as a stopgap measure.

Can we just give the network delegate ownership of all this stuff, instead? 
There's only one NetworkDelegate per profile, so I think this should just work.

[Not at Google. Contact bengr, 2014-09-18 17:29:08]

kundaji@chromium.org changed reviewers:
+ bengr@google.com

[Not at Google. Contact bengr, 2014-09-18 17:29:54]

On 2014/09/18 15:19:26, mmenke wrote:
> On 2014/09/18 15:02:37, mmenke wrote:
> > On 2014/09/17 20:56:09, kundaji wrote:
> > > mmenke:
> > >   chrome/browser/profiles/profile_impl_io_data.cc
> > >   chrome/browser/profiles/profile_impl_io_data.h
> > >   chrome/browser/profiles/profile_io_data.h
> > 
> > I'm concerned about this being a more general problem - ProfileImplIOData
owns
> > some other objects that are used by ProfileIOData or its URLRequestContexts
as
> > well.  I'd really like to try and come up with a more general solution to
> this. 
> > If I don't come up with anything today or tomorrow, let's go ahead with this
> CL,
> > as a stopgap measure.
> 
> Can we just give the network delegate ownership of all this stuff, instead? 
> There's only one NetworkDelegate per profile, so I think this should just
work.

I think that should work well. Some of these objects need to be owned by network
delegate (such as drp_params), while others (such as drp_usage_stats) are only
needed in chrome_network_delegate. But it looks like it would work if they were
created and owned by the network delegate.

I'll respond when I've made these changes.

[Not at Google. Contact bengr, 2014-09-19 17:23:33]

Moved ownership to chrome network delegate. As discussed in person, lazy_params_
holds the values until the chrome network delegate is created.

[Not at Google. Contact bengr, 2014-09-19 19:56:49]

Hi Matt,
There is now a new field in profile_impl_io_data:
data_reduction_proxy_statistics_prefs_ and we need a reference to it from both
chrome network delegate as well as profile_impl_io_data, so does not make sense
to pass ownership to chrome network delegate. We might be able to get rid of
this requirement eventually.

Since this bug causes Chrome to crash, I think the fix which moves the fields to
profile_io_data is the best option. So I have reverted to that fix. We can think
about longer term ownership in a different cl.

Ben already has 2 open bugs to sort this out: http://crbug/399326 and
http://crbug/402572.

[mmenke, 2014-09-19 20:37:52]

On 2014/09/19 19:56:49, kundaji wrote:
> Hi Matt,
> There is now a new field in profile_impl_io_data:
> data_reduction_proxy_statistics_prefs_ and we need a reference to it from both
> chrome network delegate as well as profile_impl_io_data, so does not make
sense
> to pass ownership to chrome network delegate. We might be able to get rid of
> this requirement eventually.
> 
> Since this bug causes Chrome to crash, I think the fix which moves the fields
to
> profile_io_data is the best option. So I have reverted to that fix. We can
think
> about longer term ownership in a different cl.
> 
> Ben already has 2 open bugs to sort this out: http://crbug/399326 and
> http://crbug/402572.

LGTM

[Not at Google. Contact bengr, 2014-09-19 21:41:38]

The CQ bit was checked by kundaji@chromium.org

[commit-bot: I haz the power, 2014-09-19 21:43:14]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/575143003/60001

[commit-bot: I haz the power, 2014-09-19 23:18:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-19 23:18:27]

Failed to apply patch for chrome/browser/profiles/profile_impl_io_data.cc:
While running git apply --index -p1;
  fatal: Unable to create
'/b/infra_internal/commit_queue/workdir/chromium/.git/index.lock': File exists.
  
  If no other git process is currently running, this probably means a
  git process crashed in this repository earlier. Make sure no other git
  process is running and remove the file manually to continue.

Patch:       chrome/browser/profiles/profile_impl_io_data.cc
Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc
b/chrome/browser/profiles/profile_impl_io_data.cc
index
eb1e734e83f33098988d371dcbf3e335d33709cd..0c69a5f4719c65017d9f86695f951640b7950d3d
100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -183,14 +183,13 @@ void ProfileImplIOData::Handle::Init(
     io_data_->domain_reliability_monitor_->MoveToNetworkThread();
 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
-  io_data_->data_reduction_proxy_unavailable_callback_ =
-      data_reduction_proxy_unavailable;
-  io_data_->data_reduction_proxy_chrome_configurator_ =
-      data_reduction_proxy_chrome_configurator.Pass();
-  io_data_->data_reduction_proxy_params_ =
-      data_reduction_proxy_params.Pass();
-  io_data_->data_reduction_proxy_statistics_prefs_ =
-      data_reduction_proxy_statistics_prefs.Pass();
+  io_data_->set_data_reduction_proxy_unavailable_callback(
+      data_reduction_proxy_unavailable);
+  io_data_->set_data_reduction_proxy_chrome_configurator(
+      data_reduction_proxy_chrome_configurator.Pass());
+ 
io_data_->set_data_reduction_proxy_params(data_reduction_proxy_params.Pass());
+  io_data_->set_data_reduction_proxy_statistics_prefs_(
+      data_reduction_proxy_statistics_prefs.Pass());
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 }
 
@@ -440,35 +439,36 @@ void ProfileImplIOData::InitializeInternal(
   IOThread::Globals* const io_thread_globals = io_thread->globals();
 
 #if defined(SPDY_PROXY_AUTH_ORIGIN)
-  data_reduction_proxy_auth_request_handler_.reset(
-      new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
-          DataReductionProxyChromeSettings::GetClient(),
-          chrome::VersionInfo().Version(),
-          data_reduction_proxy_params_.get(),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-  data_reduction_proxy_usage_stats_.reset(
-      new data_reduction_proxy::DataReductionProxyUsageStats(
-          data_reduction_proxy_params_.get(),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
-              .get()));
-  data_reduction_proxy_usage_stats_->set_unavailable_callback(
-      data_reduction_proxy_unavailable_callback_);
-
+  set_data_reduction_proxy_auth_request_handler(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
+          (new data_reduction_proxy::DataReductionProxyAuthRequestHandler(
+              DataReductionProxyChromeSettings::GetClient(),
+              chrome::VersionInfo().Version(),
+              data_reduction_proxy_params(),
+             
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))));
+  set_data_reduction_proxy_usage_stats(
+      scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats>
+          (new data_reduction_proxy::DataReductionProxyUsageStats(
+              data_reduction_proxy_params(),
+              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)
+                  .get())));
+  data_reduction_proxy_usage_stats()->set_unavailable_callback(
+      data_reduction_proxy_unavailable_callback());
 
   network_delegate()->set_data_reduction_proxy_params(
-      data_reduction_proxy_params_.get());
+      data_reduction_proxy_params());
   network_delegate()->set_data_reduction_proxy_usage_stats(
-      data_reduction_proxy_usage_stats_.get());
+      data_reduction_proxy_usage_stats());
   network_delegate()->set_data_reduction_proxy_auth_request_handler(
-      data_reduction_proxy_auth_request_handler_.get());
+      data_reduction_proxy_auth_request_handler());
   network_delegate()->set_data_reduction_proxy_statistics_prefs(
-      data_reduction_proxy_statistics_prefs_.get());
+      data_reduction_proxy_statistics_prefs());
   network_delegate()->set_on_resolve_proxy_handler(
       base::Bind(data_reduction_proxy::OnResolveProxyHandler));
   network_delegate()->set_proxy_config_getter(
       base::Bind(
           &DataReductionProxyChromeConfigurator::GetProxyConfigOnIO,
-          base::Unretained(data_reduction_proxy_chrome_configurator_.get())));
+          base::Unretained(data_reduction_proxy_chrome_configurator())));
 #endif  // defined(SPDY_PROXY_AUTH_ORIGIN)
 
   network_delegate()->set_predictor(predictor_.get());

[commit-bot: I haz the power, 2014-09-19 23:18:29]

Committed patchset #4 (id:60001) as d463f6b84e8a56d44904ec1418c99d7b47ea26dc

[Not at Google. Contact bengr, 2014-09-22 19:07:44]

The CQ bit was checked by kundaji@chromium.org

[commit-bot: I haz the power, 2014-09-22 19:08:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/575143003/80001

[commit-bot: I haz the power, 2014-09-22 19:23:16]

Committed patchset #5 (id:80001) as 549fca1ad5429d21e3fa899bda614533f9f1a5fe

[commit-bot: I haz the power, 2014-09-22 19:23:51]

Patchset 5 (id:??) landed as
https://crrev.com/889c8b8598637539c79b11a4b5ddd130ca576fba
Cr-Commit-Position: refs/heads/master@{#296026}