Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / profiles / profile_io_data.h

diff --git a/src/chrome/browser/profiles/profile_io_data.h b/src/chrome/browser/profiles/profile_io_data.h
index 3f6e2a2..467513c 100644 (file)
--- a/src/chrome/browser/profiles/profile_io_data.h
+++ b/src/chrome/browser/profiles/profile_io_data.h
@@ -171,7 +171,11 @@ class ProfileIOData {
     return &signin_allowed_;
   }
 
-  std::string GetMediaDeviceIDSalt() const;
+  BooleanPrefMember* network_prediction_enabled() const {
+    return &network_prediction_enabled_;
+  }
+
+  content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
 
   net::TransportSecurityState* transport_security_state() const {
     return transport_security_state_.get();
@@ -370,7 +374,7 @@ class ProfileIOData {
         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;
@@ -472,7 +476,7 @@ class ProfileIOData {
 
   mutable StringListPrefMember one_click_signin_rejected_email_list_;
 
-  mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_;
+  mutable scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;
 
   // Member variables which are pointed to by the various context objects.
   mutable BooleanPrefMember enable_referrers_;
@@ -482,6 +486,7 @@ class ProfileIOData {
   mutable BooleanPrefMember printing_enabled_;
   mutable BooleanPrefMember sync_disabled_;
   mutable BooleanPrefMember signin_allowed_;
+  mutable BooleanPrefMember network_prediction_enabled_;
   // TODO(marja): Remove session_startup_pref_ if no longer needed.
   mutable IntegerPrefMember session_startup_pref_;
   mutable BooleanPrefMember quick_check_enabled_;