CookieStore: Remove reference counting.

components/policy/core/common/cloud/system_policy_request_context.h

Index: components/policy/core/common/cloud/system_policy_request_context.h
diff --git a/components/policy/core/common/cloud/system_policy_request_context.h b/components/policy/core/common/cloud/system_policy_request_context.h
index 24f19dc76e470e36f3691afd61fb0bb9ebcbba63..f95d2a8824a1c559d1895da020e62aa000aafecd 100644
--- a/components/policy/core/common/cloud/system_policy_request_context.h
+++ b/components/policy/core/common/cloud/system_policy_request_context.h
@@ -12,6 +12,7 @@
 #define COMPONENTS_POLICY_CORE_COMMON_CLOUD_SYSTEM_POLICY_REQUEST_CONTEXT_H_
 
 namespace net {
+class CookieStore;
 class HttpNetworkLayer;
 }
 
@@ -33,13 +34,15 @@ class POLICY_EXPORT SystemPolicyRequestContext
   ~SystemPolicyRequestContext() override;
 
  private:
-  scoped_refptr<net::URLRequestContextGetter> system_context_getter_;
+  // HttpNetworkLayer associated with |context_|.
+  scoped_ptr<net::HttpNetworkLayer> http_transaction_factory_;

[Thiemo Nagel, 2016/03/07 14:03:41]

Is moving http_transaction_factory_ required for correctness or is this just a
cosmetic change?

[mmenke, 2016/03/07 14:29:20]

The URLRequestContext depends on the HttpNetworkTransaction factory.  While, in
practice, you can tear down the context first, flipping the order isn't a great
idea.

Doesn't matter if this is above or below the CookieStore, but both should be
torn down after the context.

I didn't notice the StaticHttpUserAgentSettings.  I've moved that above the
context, too.

+
+  scoped_ptr<net::CookieStore> cookie_store_;
 
   // The lazy-initialized URLRequestContext associated with this getter.
   scoped_ptr<net::URLRequestContext> context_;
 
-  // HttpNetworkLayer associated with |context_|.
-  scoped_ptr<net::HttpNetworkLayer> http_transaction_factory_;
+  scoped_refptr<net::URLRequestContextGetter> system_context_getter_;

[Thiemo Nagel, 2016/03/07 14:03:42]

Why was system_context_getter_ moved?

[mmenke, 2016/03/07 14:29:20]

Misread this file...Was thinking that this was the getter for context_ above,
which would mean it should be torn down first.  Actually, context_ depends on
this.  I've moved it back to where it was.

 
   net::StaticHttpUserAgentSettings http_user_agent_settings_;
   DISALLOW_COPY_AND_ASSIGN(SystemPolicyRequestContext);