Modifying prefetch to account for multi-profile.

chrome/browser/profiles/profile_impl_io_data.h

 // Copyright (c) 2011 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_IMPL_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 
+namespace chrome_browser_net {
+class Predictor;
+}
+
 namespace net {
 class HttpTransactionFactory;
 }  // namespace net
 
 class ProfileImplIOData : public ProfileIOData {
  public:
   class Handle {
    public:
     explicit Handle(Profile* profile);
     ~Handle();
 
     bool HasMainRequestContext() const {
       return main_request_context_getter_ != NULL;
     }
 
     // Init() must be called before ~Handle(). It records all the necessary
     // parameters needed to construct a ChromeURLRequestContextGetter.
     void Init(const FilePath& cookie_path,
               const FilePath& cache_path,
               int cache_max_size,
               const FilePath& media_cache_path,
               int media_cache_max_size,
               const FilePath& extensions_cookie_path,
-              const FilePath& app_path);
+              const FilePath& app_path,
+              chrome_browser_net::Predictor* predictor);
 
     base::Callback<ChromeURLDataManagerBackend*(void)>
         GetChromeURLDataManagerBackendGetter() const;
     const content::ResourceContext& GetResourceContext() const;
     scoped_refptr<ChromeURLRequestContextGetter>
         GetMainRequestContextGetter() const;
     scoped_refptr<ChromeURLRequestContextGetter>
         GetMediaRequestContextGetter() const;
     scoped_refptr<ChromeURLRequestContextGetter>
         GetExtensionsRequestContextGetter() const;
     scoped_refptr<ChromeURLRequestContextGetter>
         GetIsolatedAppRequestContextGetter(
             const std::string& app_id) const;
 
+    chrome_browser_net::Predictor* GetNetworkPredictor();

[willchan no longer on Chromium, 2011/08/10 07:04:08]

Where is this used? Is it needed? If it's not, I suspect you get also get rid of
ProfileIOData::GetNetworkPredictor().

[rpetterson, 2011/08/12 03:12:36]

You're right. Now that ProfileImpl has a weak pointer to the profile it's not
necessary.

+
    private:
     typedef base::hash_map<std::string,
                            scoped_refptr<ChromeURLRequestContextGetter> >
         ChromeURLRequestContextGetterMap;
 
     // Lazily initialize ProfileParams. We do this on the calls to
     // Get*RequestContextGetter(), so we only initialize ProfileParams right
     // before posting a task to the IO thread to start using them. This prevents
     // objects that are supposed to be deleted on the IO thread, but are created
     // on the UI thread from being unnecessarily initialized.
@@ skipping 36 matching lines @@
     int media_cache_max_size;
     FilePath extensions_cookie_path;
   };
 
   typedef base::hash_map<std::string, net::HttpTransactionFactory* >
       HttpTransactionFactoryMap;
 
   ProfileImplIOData();
   virtual ~ProfileImplIOData();
 
+  // The profile_io_data_ owns this predictor.
+  chrome_browser_net::Predictor* GetNetworkPredictor();
+
   virtual void LazyInitializeInternal(ProfileParams* profile_params) const;
   virtual scoped_refptr<ChromeURLRequestContext> InitializeAppRequestContext(
       scoped_refptr<ChromeURLRequestContext> main_context,
       const std::string& app_id) const;
   virtual scoped_refptr<ChromeURLRequestContext>
       AcquireMediaRequestContext() const;
   virtual scoped_refptr<ChromeURLRequestContext>
       AcquireIsolatedAppRequestContext(
           scoped_refptr<ChromeURLRequestContext> main_context,
           const std::string& app_id) const;
 
   // Lazy initialization params.
   mutable scoped_ptr<LazyParams> lazy_params_;
 
   mutable scoped_refptr<ChromeURLRequestContext> media_request_context_;
 
   mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
   mutable scoped_ptr<net::HttpTransactionFactory> media_http_factory_;
 
+  mutable scoped_ptr<chrome_browser_net::Predictor> predictor_;
+
   // Parameters needed for isolated apps.
   FilePath app_path_;
   mutable bool clear_local_state_on_exit_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImplIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_IO_DATA_H_