Merge 82973 - Cope gracefully with scripts querying stats before client has started.

remoting/client/plugin/chromoting_scriptable_object.cc

 // Copyright (c) 2010 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.
 
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "ppapi/cpp/var.h"
 #include "remoting/client/client_config.h"
@@ skipping 123 matching lines @@
 
   PropertyNameMap::const_iterator iter = property_names_.find(name.AsString());
 
   // No property found.
   if (iter == property_names_.end()) {
     return ScriptableObject::GetProperty(name, exception);
   }
 
   // If this is a statistics attribute then return the value from
   // ChromotingStats structure.
+  ChromotingStats* stats = instance_->GetStats();
   if (name.AsString() == kVideoBandwidthAttribute)
-    return instance_->GetStats()->video_bandwidth()->Rate();
+    return stats ? stats->video_bandwidth()->Rate() : Var();
   if (name.AsString() == kVideoCaptureLatencyAttribute)
-    return instance_->GetStats()->video_capture_ms()->Average();
+    return stats ? stats->video_capture_ms()->Average() : Var();
   if (name.AsString() == kVideoEncodeLatencyAttribute)
-    return instance_->GetStats()->video_encode_ms()->Average();
+    return stats ? stats->video_encode_ms()->Average() : Var();
   if (name.AsString() == kVideoDecodeLatencyAttribute)
-    return instance_->GetStats()->video_decode_ms()->Average();
+    return stats ? stats->video_decode_ms()->Average() : Var();
   if (name.AsString() == kVideoRenderLatencyAttribute)
-    return instance_->GetStats()->video_paint_ms()->Average();
+    return stats ? stats->video_paint_ms()->Average() : Var();
 
   // TODO(ajwong): This incorrectly return a null object if a function
   // property is requested.
   return properties_[iter->second].attribute;
 }
 
 void ChromotingScriptableObject::GetAllPropertyNames(
     std::vector<Var>* properties,
     Var* exception) {
   for (size_t i = 0; i < properties_.size(); i++) {
@@ skipping 263 matching lines @@
     *exception = Var("response_xml must be a string.");
     return Var();
   }
 
   xmpp_proxy_->OnIq(args[0].AsString());
 
   return Var();
 }
 
 }  // namespace remoting