Remove util.h

atom.gyp

@@ -66,7 +66,6 @@
         'native/atom_cef_client.h',
         'native/message_translation.cpp',
         'native/message_translation.h',
-        'native/util.h',
       ],
       'mac_bundle_resources': [
         'native/mac/atom.icns',
@@ -284,7 +283,6 @@
             'native/path_watcher.mm',
             'native/path_watcher.h',
             'native/main_helper_mac.mm',
-            'native/util.h',
             'native/v8_extensions/native.mm',
             'native/v8_extensions/native.h',
             'native/v8_extensions/onig_reg_exp.mm',

native/atom_cef_client.cpp

@@ -4,20 +4,24 @@
 
 #include <sstream>
 #include <iostream>
+#include <assert.h>
 #include "include/cef_path_util.h"
 #include "include/cef_process_util.h"
+#include "include/cef_task.h"
 #include "include/cef_runnable.h"
 #include "native/atom_cef_client.h"
 #include "cef_v8.h"
 
-AtomCefClient::AtomCefClient(){
+#define REQUIRE_UI_THREAD()   assert(CefCurrentlyOn(TID_UI));
+#define REQUIRE_IO_THREAD()   assert(CefCurrentlyOn(TID_IO));
+#define REQUIRE_FILE_THREAD() assert(CefCurrentlyOn(TID_FILE));
 
+AtomCefClient::AtomCefClient(){
 }
 
 AtomCefClient::~AtomCefClient() {
 }
 
-
 bool AtomCefClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
                                              CefProcessId source_process,
                                              CefRefPtr<CefProcessMessage> message) {

native/atom_cef_client.h

@@ -9,10 +9,7 @@
 #include <set>
 #include <string>
 #include "include/cef_client.h"
-#include "native/util.h"
 
-
-// AtomCefClient implementation.
 class AtomCefClient : public CefClient,
                       public CefContextMenuHandler,
                       public CefDisplayHandler,

native/message_translation.cpp

@@ -1,5 +1,5 @@
+#include <assert.h>
 #include "message_translation.h"
-#include "util.h"
 
 // Transfer a V8 value to a List index.
 void TranslateListValue(CefRefPtr<CefListValue> list, int index, CefRefPtr<CefV8Value> value) {
@@ -20,7 +20,7 @@ void TranslateListValue(CefRefPtr<CefListValue> list, int index, CefRefPtr<CefV8
 
 // Transfer a V8 array to a List.
 void TranslateList(CefRefPtr<CefV8Value> source, CefRefPtr<CefListValue> target) {
-  ASSERT(source->IsArray());
+  assert(source->IsArray());
 
   int arg_length = source->GetArrayLength();
   if (arg_length == 0)
@@ -70,7 +70,7 @@ void TranslateListValue(CefRefPtr<CefV8Value> list, int index, CefRefPtr<CefList
 
 // Transfer a List to a V8 array.
 void TranslateList(CefRefPtr<CefListValue> source, CefRefPtr<CefV8Value> target) {
-  ASSERT(target->IsArray());
+  assert(target->IsArray());
 
   int arg_length = source->GetSize();
   if (arg_length == 0)

native/util.h

@@ -1,19 +0,0 @@
-#ifndef CEF_TESTS_CEFCLIENT_UTIL_H_
-#define CEF_TESTS_CEFCLIENT_UTIL_H_
-#pragma once
-
-#include "include/cef_task.h"
-
-#include <assert.h>  // NOLINT(build/include_order)
-
-#ifndef NDEBUG
-#define ASSERT(condition) if (!(condition)) { assert(false); }
-#else
-#define ASSERT(condition) ((void)0)
-#endif
-
-#define REQUIRE_UI_THREAD()   ASSERT(CefCurrentlyOn(TID_UI));
-#define REQUIRE_IO_THREAD()   ASSERT(CefCurrentlyOn(TID_IO));
-#define REQUIRE_FILE_THREAD() ASSERT(CefCurrentlyOn(TID_FILE));
-
-#endif  // CEF_TESTS_CEFCLIENT_UTIL_H_

native/v8_extensions/atom.mm

@@ -3,7 +3,6 @@
 
 #import "atom.h"
 #import "atom_application.h"
-#import "util.h"
 #import "message_translation.h"
 
 namespace v8_extensions {