auto merge of #4157 : nkdalmia/servo/master, r=jdm

Changes
* Implemented Storage Task
* Used Storage Task in methods of storage.rs
* Updated webstorage test expectations

Pending Changes:
* Handle Storage Event
* Throw QuotaExceededError in case of failure for method setItem
* localStorage as alias of sessionStorage

1 files changed, 5 insertions, 1 deletions

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 51297269a9b..16564ca869f 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -44,6 +44,8 @@ use servo_net::image_cache_task::ImageCacheTask;
 #[cfg(not(test))]
 use servo_net::resource_task::new_resource_task;
 #[cfg(not(test))]
+use servo_net::storage_task::StorageTaskFactory;
+#[cfg(not(test))]
 use gfx::font_cache_task::FontCacheTask;
 #[cfg(not(test))]
 use servo_util::time::TimeProfiler;
@@ -113,6 +115,7 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
                 ImageCacheTask::new(resource_task.clone(), shared_task_pool)
             };
             let font_cache_task = FontCacheTask::new(resource_task.clone());
+            let storage_task = StorageTaskFactory::new();
             let constellation_chan = Constellation::<layout::layout_task::LayoutTask,
                                                      script::script_task::ScriptTask>::start(
                                                           compositor_proxy_for_constellation,
@@ -120,7 +123,8 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
                                                           image_cache_task,
                                                           font_cache_task,
                                                           time_profiler_chan_clone,
-                                                          devtools_chan);
+                                                          devtools_chan,
+                                                          storage_task);
 
             // Send the URL command to the constellation.
             let cwd = os::getcwd();