Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

services/media/framework/util/callback_joiner.h

 // Copyright 2016 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.
 
-#ifndef MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
-#define MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
+#ifndef SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
+#define SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
 
 #include <memory>
 
 #include "base/logging.h"
 #include "mojo/public/cpp/bindings/callback.h"
 
 namespace mojo {
 namespace media {
 
 // CallbackJoiner is used to take action after multiple 'child' operations are
@@ skipping 98 matching lines @@
   }
 
  private:
   size_t counter_ = 0;
   Callback<void()> join_callback_;
 };
 
 }  // namespace media
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_
+#endif  // SERVICES_MEDIA_FRAMEWORK_UTIL_CALLBACK_JOINER_H_