Auto merge of #6401 - jgraham:load_timeout, r=metajack

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6401)
<!-- Reviewable:end -->

2 files changed, 6 insertions, 3 deletions

diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
index c8d5bf0ceb2..16a68dc7532 100644
--- a/components/msg/constellation_msg.rs
+++ b/components/msg/constellation_msg.rs
@@ -19,7 +19,7 @@ use std::collections::HashMap;
 use std::sync::mpsc::{channel, Sender, Receiver};
 use style::viewport::ViewportConstraints;
 use url::Url;
-use webdriver_msg::{WebDriverScriptCommand, LoadComplete};
+use webdriver_msg::{WebDriverScriptCommand, LoadStatus};
 
 #[derive(Clone)]
 pub struct ConstellationChan(pub Sender<Msg>);
@@ -328,7 +328,7 @@ impl MozBrowserEvent {
 }
 
 pub enum WebDriverCommandMsg {
-    LoadUrl(PipelineId, LoadData, Sender<LoadComplete>),
+    LoadUrl(PipelineId, LoadData, Sender<LoadStatus>),
     ScriptCommand(PipelineId, WebDriverScriptCommand),
     TakeScreenshot(PipelineId, Sender<Option<png::Image>>)
 }
diff --git a/components/msg/webdriver_msg.rs b/components/msg/webdriver_msg.rs
index 7921bb0a156..bc57f58fa28 100644
--- a/components/msg/webdriver_msg.rs
+++ b/components/msg/webdriver_msg.rs
@@ -53,4 +53,7 @@ impl ToJson for WebDriverJSValue {
     }
 }
 
-pub struct LoadComplete;
+pub enum LoadStatus {
+    LoadComplete,
+    LoadTimeout
+}