Roll //build, //native_client, and a few more targets of opportunity.

sandbox/linux/tests/unit_tests.h

 // Copyright (c) 2012 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 SANDBOX_LINUX_TESTS_UNIT_TESTS_H__
-#define SANDBOX_LINUX_TESTS_UNIT_TESTS_H__
+#ifndef SANDBOX_LINUX_TESTS_UNIT_TESTS_H_
+#define SANDBOX_LINUX_TESTS_UNIT_TESTS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "sandbox/linux/tests/sandbox_test_runner_function_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 // Has this been compiled to run on Android?
 bool IsAndroid();
 
 bool IsArchitectureArm();
@@ skipping 172 matching lines @@
   static void DeathBySignal(int status,
                             const std::string& msg,
                             const void* aux);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(UnitTests);
 };
 
 }  // namespace
 
-#endif  // SANDBOX_LINUX_TESTS_UNIT_TESTS_H__
+#endif  // SANDBOX_LINUX_TESTS_UNIT_TESTS_H_