Clean up ifndef/define statements

Atom-Linux/atom.h

@@ -1,9 +1,5 @@
-// Copyright (c) 2011 The Chromium Embedded Framework 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 CEF_TESTS_CEFCLIENT_CEFCLIENT_H_
-#define CEF_TESTS_CEFCLIENT_CEFCLIENT_H_
+#ifndef ATOM_H_
+#define ATOM_H_
 #pragma once
 
 #include <string>
@@ -31,4 +27,4 @@ std::string PathToOpen();
 // Returns the application settings
 void AppGetSettings(CefSettings& settings, CefRefPtr<CefApp>& app);
 
-#endif  // CEF_TESTS_CEFCLIENT_CEFCLIENT_H_
+#endif

Atom-Linux/client_handler.h

@@ -1,9 +1,5 @@
-// Copyright (c) 2011 The Chromium Embedded Framework 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 CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
-#define CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
+#ifndef CLIENT_HANDLER_H_
+#define CLIENT_HANDLER_H_
 #pragma once
 
 #include <map>
@@ -156,4 +152,4 @@ IMPLEMENT_LOCKING(ClientHandler)
   ;
 };
 
-#endif  // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
+#endif

Atom-Linux/native_handler.h

@@ -1,5 +1,5 @@
-#ifndef CEF_TESTS_CEFCLIENT_NATIVE_HANDLER_H_
-#define CEF_TESTS_CEFCLIENT_NATIVE_HANDLER_H_
+#ifndef NATIVE_HANDLER_H_
+#define NATIVE_HANDLER_H_
 
 #include "include/cef_base.h"
 #include "include/cef_v8.h"

Atom-Linux/util.h

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#ifndef CEF_TESTS_CEFCLIENT_UTIL_H_
-#define CEF_TESTS_CEFCLIENT_UTIL_H_
+#ifndef UTIL_H_
+#define UTIL_H_
 #pragma once
 
 #include "include/cef_task.h"
@@ -19,4 +19,4 @@
 #define REQUIRE_IO_THREAD()   ASSERT(CefCurrentlyOn(TID_IO));
 #define REQUIRE_FILE_THREAD() ASSERT(CefCurrentlyOn(TID_FILE));
 
-#endif  // CEF_TESTS_CEFCLIENT_UTIL_H_
+#endif