Allow retrieval of media device ID salt even after ResourceContext has gone away.

chrome/browser/profiles/profile_io_data.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 157 matching lines @@
   }
 
   BooleanPrefMember* signin_allowed() const {
     return &signin_allowed_;
   }
 
   BooleanPrefMember* network_prediction_enabled() const {
     return &network_prediction_enabled_;
   }
 
-  std::string GetMediaDeviceIDSalt() const;
+  content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
 
   net::TransportSecurityState* transport_security_state() const {
     return transport_security_state_.get();
   }
 
 #if defined(OS_CHROMEOS)
   std::string username_hash() const {
     return username_hash_;
   }
 #endif
@@ skipping 178 matching lines @@
     virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
     virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE;
     virtual void CreateKeygenHandler(
         uint32 key_size_in_bits,
         const std::string& challenge_string,
         const GURL& url,
         const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback)
         OVERRIDE;
     virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
     virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
-    virtual std::string GetMediaDeviceIDSalt() OVERRIDE;
+    virtual SaltCallback GetMediaDeviceIDSalt() OVERRIDE;
 
    private:
     friend class ProfileIOData;
 
     // Helper method that returns true if |type| is allowed for |origin|, false
     // otherwise.
     bool AllowContentAccess(const GURL& origin, ContentSettingsType type);
 
     ProfileIOData* const io_data_;
 
@@ skipping 81 matching lines @@
   mutable StringPrefMember google_services_username_;
   mutable StringPrefMember google_services_username_pattern_;
   mutable BooleanPrefMember reverse_autologin_enabled_;
 
   // During the reverse autologin request chain processing, this member saves
   // the email of the google account that is being signed into.
   std::string reverse_autologin_pending_email_;
 
   mutable StringListPrefMember one_click_signin_rejected_email_list_;
 
-  mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_;
+  mutable scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;

[willchan no longer on Chromium, 2014/02/12 19:32:23]

Who owns MediaDeviceIDSalt now?

 
   // Member variables which are pointed to by the various context objects.
   mutable BooleanPrefMember enable_referrers_;
   mutable BooleanPrefMember enable_do_not_track_;
   mutable BooleanPrefMember force_safesearch_;
   mutable BooleanPrefMember safe_browsing_enabled_;
   mutable BooleanPrefMember printing_enabled_;
   mutable BooleanPrefMember sync_disabled_;
   mutable BooleanPrefMember signin_allowed_;
   mutable BooleanPrefMember network_prediction_enabled_;
@@ skipping 57 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   bool is_incognito_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_