Change the canonical way to include the C macros.h to <mojo/macros.h>.

mojo/public/cpp/utility/lib/run_loop.cc

 // Copyright 2014 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.
 
 #include "mojo/public/cpp/utility/run_loop.h"
 
 #include <assert.h>
+#include <mojo/macros.h>
 #include <pthread.h>
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 #include <vector>
 
-#include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/system/time.h"
 #include "mojo/public/cpp/system/wait.h"
 #include "mojo/public/cpp/utility/run_loop_handler.h"
 
 namespace mojo {
 namespace {
 
 // The initial and maximum number of results that we'll accept from
 // |WaitSetWait()|. TODO(vtl): I just made up these numbers.
 constexpr uint32_t kInitialWaitSetNumResults = 16u;
@@ skipping 361 matching lines @@
     handler->OnHandleError(id, MOJO_RESULT_DEADLINE_EXCEEDED);
     did_work = true;
 
     if (current_run_state_->should_quit)
       break;
   }
   return did_work;
 }
 
 }  // namespace mojo