Modifying prefetch to account for multi-profile.

chrome/browser/io_thread.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

[willchan no longer on Chromium, 2011/08/10 16:10:35]

After your changes, there does not appear to be any reason for IOThread to need
to know anything about Predictor. Please remove all references here.

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

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 #pragma once
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/profiles/profile.h"

[willchan no longer on Chromium, 2011/08/10 16:10:35]

I don't think this needs to be here.

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

Done.

 #include "chrome/common/net/predictor_common.h"
 #include "net/base/network_change_notifier.h"
 
 class ChromeNetLog;
 class ChromeURLRequestContextGetter;
 class ExtensionEventRouterForwarder;
 class MediaInternals;
 class PrefProxyConfigTracker;
 class PrefService;
 class SystemURLRequestContextGetter;
 
 namespace base {
 class ListValue;
 }
 
 namespace chrome_browser_net {
-class ConnectInterceptor;
 class Predictor;
 }  // namespace chrome_browser_net
 
 namespace net {
 class CertVerifier;
 class DnsRRResolver;
 class FtpTransactionFactory;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpTransactionFactory;
@@ skipping 58 matching lines @@
   // Can only be called on the IO thread.
   Globals* globals();
 
   ChromeNetLog* net_log();
 
   // Initializes the network predictor, which induces DNS pre-resolution and/or
   // TCP/IP preconnections.  |prefetching_enabled| indicates whether or not DNS
   // prefetching should be enabled, and |preconnect_enabled| controls whether
   // TCP/IP preconnection is enabled.  This should be called by the UI thread.
   // It will post a task to the IO thread to perform the actual initialization.
-  void InitNetworkPredictor(bool prefetching_enabled,
-                            base::TimeDelta max_dns_queue_delay,
-                            size_t max_speculative_parallel_resolves,
-                            const chrome_common_net::UrlList& startup_urls,
+  void InitNetworkPredictor(const chrome_common_net::UrlList& startup_urls,
                             base::ListValue* referral_list,
-                            bool preconnect_enabled);
-
-  // Handles changing to On The Record mode, discarding confidential data.
-  void ChangedToOnTheRecord();
+                            chrome_browser_net::Predictor* predictor);

[jar (doing other things), 2011/08/16 01:19:09]

This method name is now confusing.  It appears that you pass in a predictor...
but the method suggests we initialize it.  IN the past, it really constructed
the essences of it (all statics).  Now presumably it will better populate the
|predictor| it is given.  That sure sounds like it should be a Predictor method.
 Alternatively, should this be a request for a construction of a Predictor? 

...or does the method name and comment need to change?

 
   // Returns a getter for the URLRequestContext.  Only called on the UI thread.
   net::URLRequestContextGetter* system_url_request_context_getter();
 
   // Clear all network stack history, including the host cache, as well as
   // speculative data about subresources of visited sites, and startup-time
   // navigations.
-  void ClearNetworkingHistory();
+  void ClearNetworkingHistory(chrome_browser_net::Predictor* predictor);
 
  protected:
   virtual void Init();
   virtual void CleanUp();
 
  private:
   // Provide SystemURLRequestContextGetter with access to
   // InitSystemRequestContext().
   friend class SystemURLRequestContextGetter;
 
   static void RegisterPrefs(PrefService* local_state);
 
   net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(
       net::HostResolver* resolver);
 
   void InitSystemRequestContext();
 
   // Lazy initialization of system request context for
   // SystemURLRequestContextGetter. To be called on IO thread.
   void InitSystemRequestContextOnIOThread();
 
   void InitNetworkPredictorOnIOThread(
-      bool prefetching_enabled,
-      base::TimeDelta max_dns_queue_delay,
-      size_t max_speculative_parallel_resolves,
       const chrome_common_net::UrlList& startup_urls,
       base::ListValue* referral_list,
-      bool preconnect_enabled);
-
-  void ChangedToOnTheRecordOnIOThread();
+      chrome_browser_net::Predictor* predictor);
 
   // Clears the host cache.  Intended to be used to prevent exposing recently
   // visited sites on about:net-internals/#dns and about:dns pages.  Must be
   // called on the IO thread.
   void ClearHostCache();
 
   // Returns an SSLConfigService instance.
   net::SSLConfigService* GetSSLConfigService();
 
   // The NetLog is owned by the browser process, to allow logging from other
@@ skipping 28 matching lines @@
   std::string auth_delegate_whitelist_;
   std::string gssapi_library_name_;
 
   // This is an instance of the default SSLConfigServiceManager for the current
   // platform and it gets SSL preferences from local_state object.
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
 
   // These member variables are initialized by a task posted to the IO thread,
   // which gets posted by calling certain member functions of IOThread.
 
   // Note: we user explicit pointers rather than smart pointers to be more

[willchan no longer on Chromium, 2011/08/10 16:10:35]

This comment is no longer true, just delete it.

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

Done.

   // explicit about destruction order, and ensure that there is no chance that
   // these observers would be used accidentally after we have begun to tear
   // down.
-  chrome_browser_net::ConnectInterceptor* speculative_interceptor_;
-  chrome_browser_net::Predictor* predictor_;
-
   scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
 
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   scoped_refptr<net::URLRequestContextGetter>
       system_url_request_context_getter_;
 
   ScopedRunnableMethodFactory<IOThread> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_