arc: rename GetInstanceForVersion

components/arc/instance_holder.h

 // Copyright 2015 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 COMPONENTS_ARC_INSTANCE_HOLDER_H_
 #define COMPONENTS_ARC_INSTANCE_HOLDER_H_
 
 #include <string>
 #include <type_traits>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 
-// A convenience macro to call arc::InstanceHolder<T>::GetInstanceForVersion().
+// A convenience macro to call

[Luis Héctor Chávez, 2017/01/09 18:41:02]

This is now not a convenience macro, but the only way to do so :)

[Yusuke Sato, 2017/01/09 19:10:31]

Done.

+// arc::InstanceHolder<T>::GetInstanceForVersionDoNotCallDirectly().
 // In order to avoid exposing method names from within the Mojo bindings, we
 // will rely on stringification and the fact that the method min versions have a
 // consistent naming scheme.
 #define ARC_GET_INSTANCE_FOR_METHOD(holder, method_name)        \
-  (holder)->GetInstanceForVersion(                              \
+  (holder)->GetInstanceForVersionDoNotCallDirectly(             \
       std::remove_pointer<decltype(                             \
           holder)>::type::Instance::k##method_name##MinVersion, \
       #method_name)
 
 namespace arc {
 
 // Holds a Mojo instance+version pair. This also allows for listening for state
 // changes for the particular instance. T should be a Mojo interface type
 // (arc::mojom::XxxInstance).
 template <typename T>
@@ skipping 20 matching lines @@
   // interface. Use an Observer if you want to be notified when this is ready.
   // This can only be called on the thread that this class was created on.
   bool has_instance() const { return instance_; }
 
   // Gets the Mojo interface that's intended to call for
   // |method_name_for_logging|, but only if its reported version is at least
   // |min_version|. Returns nullptr if the instance is either not ready or does
   // not have the requested version, and logs appropriately.
   // This function should not be called directly. Instead, use the
   // ARC_GET_INSTANCE_FOR_METHOD() macro.
-  T* GetInstanceForVersion(uint32_t min_version,
-                           const char method_name_for_logging[]) {
+  T* GetInstanceForVersionDoNotCallDirectly(
+      uint32_t min_version,
+      const char method_name_for_logging[]) {
     if (!instance_) {
       VLOG(1) << "Instance for " << T::Name_ << "::" << method_name_for_logging
               << " not available.";
       return nullptr;
     }
     if (version_ < min_version) {
       LOG(ERROR) << "Instance for " << T::Name_
                  << "::" << method_name_for_logging
                  << " version mismatch. Expected " << min_version << " got "
                  << version_;
@@ skipping 49 matching lines @@
 
   base::ThreadChecker thread_checker_;
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceHolder<T>);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_INSTANCE_HOLDER_H_