1 files changed, 85 insertions, 91 deletions

diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 2cd6363..521def9 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h
@@ -15,112 +15,106 @@
 namespace cc {
 
 class FakeTimeSourceClient : public cc::TimeSourceClient {
-public:
-    FakeTimeSourceClient() { reset(); }
-    void reset() { m_tickCalled = false; }
-    bool tickCalled() const { return m_tickCalled; }
+ public:
+  FakeTimeSourceClient() { Reset(); }
+  void Reset() { tick_called_ = false; }
+  bool TickCalled() const { return tick_called_; }
 
-    // TimeSourceClient implementation.
-    virtual void OnTimerTick() OVERRIDE;
+  // TimeSourceClient implementation.
+  virtual void OnTimerTick() OVERRIDE;
 
-protected:
-    bool m_tickCalled;
+ protected:
+  bool tick_called_;
 };
 
 class FakeThread : public cc::Thread {
-public:
-    FakeThread();
-    virtual ~FakeThread();
-
-    void reset()
-    {
-        m_pendingTaskDelay = 0;
-        m_pendingTask.reset();
-        m_runPendingTaskOnOverwrite = false;
-    }
-
-    void runPendingTaskOnOverwrite(bool enable)
-    {
-        m_runPendingTaskOnOverwrite = enable;
-    }
-
-    bool hasPendingTask() const { return m_pendingTask; }
-    void runPendingTask();
-
-    long long pendingDelayMs() const
-    {
-        EXPECT_TRUE(hasPendingTask());
-        return m_pendingTaskDelay;
-    }
-
-    virtual void PostTask(base::Closure cb) OVERRIDE;
-    virtual void PostDelayedTask(base::Closure cb, base::TimeDelta delay)
-        OVERRIDE;
-    virtual bool BelongsToCurrentThread() const OVERRIDE;
-
-protected:
-    scoped_ptr<base::Closure> m_pendingTask;
-    long long m_pendingTaskDelay;
-    bool m_runPendingTaskOnOverwrite;
+ public:
+  FakeThread();
+  virtual ~FakeThread();
+
+  void Reset() {
+    pending_task_delay_ = 0;
+    pending_task_.reset();
+    run_pending_task_on_overwrite_ = false;
+  }
+
+  void RunPendingTaskOnOverwrite(bool enable) {
+    run_pending_task_on_overwrite_ = enable;
+  }
+
+  bool HasPendingTask() const { return pending_task_; }
+  void RunPendingTask();
+
+  long long PendingDelayMs() const {
+    EXPECT_TRUE(HasPendingTask());
+    return pending_task_delay_;
+  }
+
+  virtual void PostTask(base::Closure cb) OVERRIDE;
+  virtual void PostDelayedTask(base::Closure cb, base::TimeDelta delay)
+      OVERRIDE;
+  virtual bool BelongsToCurrentThread() const OVERRIDE;
+
+ protected:
+  scoped_ptr<base::Closure> pending_task_;
+  long long pending_task_delay_;
+  bool run_pending_task_on_overwrite_;
 };
 
 class FakeTimeSource : public cc::TimeSource {
-public:
-    FakeTimeSource()
-        : m_active(false)
-        , m_client(0)
-    {
-    }
-
-    virtual void SetClient(cc::TimeSourceClient* client) OVERRIDE;
-    virtual void SetActive(bool b) OVERRIDE;
-    virtual bool Active() const OVERRIDE;
-    virtual void SetTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE { }
-    virtual base::TimeTicks LastTickTime() OVERRIDE;
-    virtual base::TimeTicks NextTickTime() OVERRIDE;
-
-    void tick()
-    {
-        ASSERT_TRUE(m_active);
-        if (m_client)
-            m_client->OnTimerTick();
-    }
-
-    void setNextTickTime(base::TimeTicks nextTickTime) { m_nextTickTime = nextTickTime; }
-
-protected:
-    virtual ~FakeTimeSource() { }
-
-    bool m_active;
-    base::TimeTicks m_nextTickTime;
-    cc::TimeSourceClient* m_client;
+ public:
+  FakeTimeSource() : active_(false), client_(0) {}
+
+  virtual void SetClient(cc::TimeSourceClient* client) OVERRIDE;
+  virtual void SetActive(bool b) OVERRIDE;
+  virtual bool Active() const OVERRIDE;
+  virtual void SetTimebaseAndInterval(base::TimeTicks timebase,
+                                      base::TimeDelta interval) OVERRIDE {}
+  virtual base::TimeTicks LastTickTime() OVERRIDE;
+  virtual base::TimeTicks NextTickTime() OVERRIDE;
+
+  void Tick() {
+    ASSERT_TRUE(active_);
+    if (client_)
+      client_->OnTimerTick();
+  }
+
+  void SetNextTickTime(base::TimeTicks next_tick_time) {
+    next_tick_time_ = next_tick_time;
+  }
+
+ protected:
+  virtual ~FakeTimeSource() {}
+
+  bool active_;
+  base::TimeTicks next_tick_time_;
+  cc::TimeSourceClient* client_;
 };
 
 class FakeDelayBasedTimeSource : public cc::DelayBasedTimeSource {
-public:
-    static scoped_refptr<FakeDelayBasedTimeSource> create(base::TimeDelta interval, cc::Thread* thread)
-    {
-        return make_scoped_refptr(new FakeDelayBasedTimeSource(interval, thread));
-    }
-
-    void setNow(base::TimeTicks time) { m_now = time; }
-    virtual base::TimeTicks Now() const OVERRIDE;
-
-protected:
-    FakeDelayBasedTimeSource(base::TimeDelta interval, cc::Thread* thread)
-        : DelayBasedTimeSource(interval, thread)
-    {
-    }
-    virtual ~FakeDelayBasedTimeSource() { }
-
-    base::TimeTicks m_now;
+ public:
+  static scoped_refptr<FakeDelayBasedTimeSource> Create(
+      base::TimeDelta interval, cc::Thread* thread) {
+    return make_scoped_refptr(new FakeDelayBasedTimeSource(interval, thread));
+  }
+
+  void SetNow(base::TimeTicks time) { now_ = time; }
+  virtual base::TimeTicks Now() const OVERRIDE;
+
+ protected:
+  FakeDelayBasedTimeSource(base::TimeDelta interval, cc::Thread* thread)
+      : DelayBasedTimeSource(interval, thread) {}
+  virtual ~FakeDelayBasedTimeSource() {}
+
+  base::TimeTicks now_;
 };
 
 class FakeFrameRateController : public cc::FrameRateController {
-public:
-    FakeFrameRateController(scoped_refptr<cc::TimeSource> timer) : cc::FrameRateController(timer) { }
+ public:
+  FakeFrameRateController(scoped_refptr<cc::TimeSource> timer)
+      : cc::FrameRateController(timer) {}
 
-    int numFramesPending() const { return num_frames_pending_; }
+  int NumFramesPending() const { return num_frames_pending_; }
 };
 
 }  // namespace cc