Code cleanup: moving poly/ into xenia/base/

src/xenia/ui/win32/win32_loop.cc

@@ -9,7 +9,7 @@
 
 #include "xenia/ui/win32/win32_loop.h"
 
-#include "poly/assert.h"
+#include "xenia/base/assert.h"
 
 namespace xe {
 namespace ui {
@@ -28,9 +28,9 @@ class PostedFn {
 };
 
 Win32Loop::Win32Loop() : thread_id_(0) {
-  poly::threading::Fence init_fence;
+  xe::threading::Fence init_fence;
   thread_ = std::thread([&]() {
-    poly::threading::set_name("Win32 Loop");
+    xe::threading::set_name("Win32 Loop");
     thread_id_ = GetCurrentThreadId();
 
     // Make a Win32 call to enable the thread queue.

src/xenia/ui/win32/win32_loop.h

@@ -18,7 +18,7 @@
 #include <mutex>
 #include <thread>
 
-#include "poly/threading.h"
+#include "xenia/base/threading.h"
 #include "xenia/ui/loop.h"
 
 namespace xe {
@@ -40,7 +40,7 @@ class Win32Loop : public Loop {
 
   std::thread thread_;
   DWORD thread_id_;
-  poly::threading::Fence quit_fence_;
+  xe::threading::Fence quit_fence_;
 };
 
 }  // namespace win32

src/xenia/ui/win32/win32_window.cc

@@ -13,7 +13,7 @@
 #include <tpcshrd.h>
 #include <windowsx.h>
 
-#include "xenia/logging.h"
+#include "xenia/base/logging.h"
 
 namespace xe {
 namespace ui {