Mozart: Ensure time always runs forward.

services/gfx/compositor/scene_state.h

 // Copyright 2015 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 SERVICES_GFX_COMPOSITOR_SCENE_STATE_H_
 #define SERVICES_GFX_COMPOSITOR_SCENE_STATE_H_
 
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ skipping 16 matching lines @@
 class SceneState {
  public:
   SceneState(mojo::gfx::composition::SceneTokenPtr scene_token,
              const std::string& label);
   ~SceneState();
 
   base::WeakPtr<SceneState> GetWeakPtr() { return weak_factory_.GetWeakPtr(); }
 
   // Gets the token used to refer to this scene globally.
   // Caller does not obtain ownership of the token.
-  const mojo::gfx::composition::SceneToken* scene_token() {
-    return scene_token_.get();
+  const mojo::gfx::composition::SceneToken& scene_token() {
+    return *scene_token_;
   }
 
   // Gets or sets the scene listener interface.
   mojo::gfx::composition::SceneListener* scene_listener() {
     return scene_listener_.get();
   }
   void set_scene_listener(mojo::gfx::composition::SceneListenerPtr listener) {
     scene_listener_ = listener.Pass();
   }
 
@@ skipping 20 matching lines @@
   base::WeakPtrFactory<SceneState> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SceneState);
 };
 
 std::ostream& operator<<(std::ostream& os, SceneState* scene_state);
 
 }  // namespace compositor
 
 #endif  // SERVICES_GFX_COMPOSITOR_SCENE_STATE_H_