Revert "Merge v8globals.h and globals.h"

src/sampler.h

 // Copyright 2013 the V8 project 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 V8_SAMPLER_H_
 #define V8_SAMPLER_H_
 
 #include "atomicops.h"
 #include "frames.h"
-#include "globals.h"
+#include "v8globals.h"
 
 namespace v8 {
 namespace internal {
 
 class Isolate;
 
 // ----------------------------------------------------------------------------
 // Sampler
 //
 // A sampler periodically samples the state of the VM and optionally
@@ skipping 98 matching lines @@
   bool is_counting_samples_;
   // Counts stack samples taken in JS VM state.
   unsigned js_and_external_sample_count_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(Sampler);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_SAMPLER_H_