6 files changed, 16 insertions, 5 deletions
diff --git a/cc/scheduler/delay_based_time_source_unittest.cc b/cc/scheduler/delay_based_time_source_unittest.cc
index a4493a5..c368195 100644
--- a/cc/scheduler/delay_based_time_source_unittest.cc
+++ b/cc/scheduler/delay_based_time_source_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "cc/scheduler/delay_based_time_source.h"
 
+#include "base/basictypes.h"
 #include "cc/base/thread.h"
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -303,7 +304,7 @@ TEST(DelayBasedTimeSourceTest, AchievesTargetRateWithNoNoise) {
 
   double total_frame_time = 0.0;
   for (int i = 0; i < num_iterations; ++i) {
-    long long delay_ms = thread.PendingDelayMs();
+    int64 delay_ms = thread.PendingDelayMs();
 
     // accumulate the "delay"
     total_frame_time += delay_ms / 1000.0;
diff --git a/cc/scheduler/rate_limiter.h b/cc/scheduler/rate_limiter.h
index 522528f..0d2de38 100644
--- a/cc/scheduler/rate_limiter.h
+++ b/cc/scheduler/rate_limiter.h
@@ -16,6 +16,9 @@ class Thread;
 class RateLimiterClient {
  public:
   virtual void RateLimit() = 0;
+
+ protected:
+  virtual ~RateLimiterClient() {}
 };
 
 // A RateLimiter can be used to make sure that a single context does not
@@ -53,5 +56,6 @@ class RateLimiter : public base::RefCounted<RateLimiter> {
   DISALLOW_COPY_AND_ASSIGN(RateLimiter);
 };
 
-}
+}  // namespace cc
+
 #endif  // CC_SCHEDULER_RATE_LIMITER_H_
diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 63463db..4c342af 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h
@@ -27,7 +27,7 @@ namespace cc {
 class CC_EXPORT SchedulerStateMachine {
  public:
   // settings must be valid for the lifetime of this class.
-  SchedulerStateMachine(const SchedulerSettings& settings);
+  explicit SchedulerStateMachine(const SchedulerSettings& settings);
 
   enum CommitState {
     COMMIT_STATE_IDLE,
diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc
index f15bb8f..93fc82f 100644
--- a/cc/scheduler/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc
@@ -21,7 +21,7 @@ const SchedulerStateMachine::CommitState all_commit_states[] = {
 // Exposes the protected state fields of the SchedulerStateMachine for testing
 class StateMachine : public SchedulerStateMachine {
  public:
-  StateMachine(const SchedulerSettings& scheduler_settings)
+  explicit StateMachine(const SchedulerSettings& scheduler_settings)
       : SchedulerStateMachine(scheduler_settings) {}
   void SetCommitState(CommitState cs) { commit_state_ = cs; }
   CommitState CommitState() const { return commit_state_; }
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index f47a872..a2c968c 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "cc/scheduler/scheduler.h"
 
+#include <vector>
+
 #include "base/logging.h"
 #include "cc/test/scheduler_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/scheduler/texture_uploader_unittest.cc b/cc/scheduler/texture_uploader_unittest.cc
index edb7e09..d5c8e49 100644
--- a/cc/scheduler/texture_uploader_unittest.cc
+++ b/cc/scheduler/texture_uploader_unittest.cc
@@ -12,7 +12,11 @@
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
-using namespace WebKit;
+using WebKit::WGC3Denum;
+using WebKit::WGC3Dint;
+using WebKit::WGC3Dsizei;
+using WebKit::WebGLId;
+using WebKit::WGC3Duint;
 
 namespace cc {
 namespace {