Initial refactor to get profiles to propagate storage partition details.

chrome/browser/net/chrome_url_request_context.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_NET_CHROME_URL_REQUEST_CONTEXT_H_
 #define CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "chrome/browser/profiles/storage_partition_descriptor.h"

[mmenke, 2012/10/30 18:27:15]

This shouldn't be needed, with the forward declaration.

If it is needed for some reason I'm missing, both the forward declaration and
the include in the cc file should be removed.

[nasko, 2012/10/30 19:55:25]

Done.

 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job_factory.h"
 
 class ChromeURLDataManagerBackend;
 class ChromeURLRequestContextFactory;
 class IOThread;
 class Profile;
 class ProfileIOData;
+struct StoragePartitionDescriptor;
 
 namespace chrome_browser_net {
 class LoadTimeStats;
 }
 
 // Subclass of net::URLRequestContext which can be used to store extra
 // information for requests.
 //
 // All methods of this class must be called from the IO thread,
 // including the constructor and destructor.
@@ skipping 105 matching lines @@
   // Create an instance for an original profile for extensions. This is expected
   // to get called on UI thread.
   static ChromeURLRequestContextGetter* CreateOriginalForExtensions(
       Profile* profile, const ProfileIOData* profile_io_data);
 
   // Create an instance for an original profile for an app with isolated
   // storage. This is expected to get called on UI thread.
   static ChromeURLRequestContextGetter* CreateOriginalForIsolatedApp(
       Profile* profile,
       const ProfileIOData* profile_io_data,
-      const std::string& app_id,
+      const StoragePartitionDescriptor& partition_descriptor,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
           protocol_handler_interceptor);
 
   // Create an instance for an original profile for media with isolated
   // storage. This is expected to get called on UI thread.
   static ChromeURLRequestContextGetter* CreateOriginalForIsolatedMedia(
       Profile* profile,
       ChromeURLRequestContextGetter* app_context,
       const ProfileIOData* profile_io_data,
-      const std::string& app_id);
+      const StoragePartitionDescriptor& partition_descriptor);
 
   // Create an instance for use with an OTR profile. This is expected to get
   // called on the UI thread.
   static ChromeURLRequestContextGetter* CreateOffTheRecord(
       Profile* profile, const ProfileIOData* profile_io_data);
 
   // Create an instance for an OTR profile for extensions. This is expected
   // to get called on UI thread.
   static ChromeURLRequestContextGetter* CreateOffTheRecordForExtensions(
       Profile* profile, const ProfileIOData* profile_io_data);
 
   // Create an instance for an OTR profile for an app with isolated storage.
   // This is expected to get called on UI thread.
   static ChromeURLRequestContextGetter* CreateOffTheRecordForIsolatedApp(
       Profile* profile,
       const ProfileIOData* profile_io_data,
-      const std::string& app_id,
+      const StoragePartitionDescriptor& partition_descriptor,
       scoped_ptr<net::URLRequestJobFactory::Interceptor>
           protocol_handler_interceptor);
 
   // Clean up UI thread resources. This is expected to get called on the UI
   // thread before the instance is deleted on the IO thread.
   void CleanupOnUIThread();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 20 matching lines @@
 
   // NULL if not yet initialized. Otherwise, it is the ChromeURLRequestContext
   // instance that was lazily created by GetURLRequestContext().
   // Access only from the IO thread.
   base::WeakPtr<ChromeURLRequestContext> url_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextGetter);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_URL_REQUEST_CONTEXT_H_