libcef_dll_wrapper:

- Include cef_logging.h instead of base/logging.h to avoid link errors.

cefclient:
- Remove duplicate definition of the min macro.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@132 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef_dll/wrapper/cef_xml_object.cc

@@ -3,7 +3,8 @@
 // can be found in the LICENSE file.
 
 #include "include/cef_wrapper.h"
-#include "base/logging.h"
+#include "libcef_dll/cef_logging.h"
+#include <sstream>
 
 namespace {
 
@@ -103,7 +104,7 @@ public:
               cur_object->GetName() != reader->GetQualifiedName()) {
             // Open tag without close tag or close tag without open tag should
             // never occur (the parser catches this error).
-            NOTREACHED();
+            DCHECK(FALSE);
             std::wstringstream ss;
             ss << L"Mismatched end tag for " << cur_object->GetName() <<
                 L", line " << reader->GetLineNumber();

libcef_dll/wrapper/cef_zip_archive.cc

@@ -3,7 +3,7 @@
 // can be found in the LICENSE file.
 
 #include "include/cef_wrapper.h"
-#include "base/logging.h"
+#include "libcef_dll/cef_logging.h"
 #include <algorithm>
 
 namespace {

tests/cefclient/util.h

@@ -44,8 +44,4 @@
 
 #endif // _WIN32
 
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
-#endif
-
 #endif // _CEFCLIENT_UTIL_H