Migrate BrowserAccessibility windows unique id handling to AXPlatformNodeWin.

content/browser/accessibility/browser_accessibility.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 57 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 class CONTENT_EXPORT BrowserAccessibility : public ui::AXPlatformNodeDelegate {
  public:
   // Creates a platform specific BrowserAccessibility. Ownership passes to the
   // caller.
   static BrowserAccessibility* Create();
 
   virtual ~BrowserAccessibility();
 
-  static BrowserAccessibility* GetFromUniqueID(int32_t unique_id);
+  static BrowserAccessibility* GetFromUniqueId(int32_t unique_id);
 
   // Called only once, immediately after construction. The constructor doesn't
   // take any arguments because in the Windows subclass we use a special
   // function to construct a COM object.
   virtual void Init(BrowserAccessibilityManager* manager, ui::AXNode* node);
 
   // Called after the object is first initialized and again every time
   // its data changes.
   virtual void OnDataChanged() {}
 
@@ skipping 104 matching lines @@
   // has had Destroy() called but its reference count is not yet zero,
   // instance_active() returns false and queries on this object return failure.
   virtual void Destroy();
 
   // Subclasses should override this to support platform reference counting.
   virtual void NativeAddReference() { }
 
   // Subclasses should override this to support platform reference counting.
   virtual void NativeReleaseReference();
 
+  virtual int32_t unique_id() const;

[dmazzoni, 2017/07/17 08:38:20]

Since this is virtual it needs to get GetUniqueId() now - by convention,
lowercase_with_underscores is only allowed for trivial accessors,
and this definitely isn't!

Is the unique id actually used anywhere other than Windows and
Android? Hopefully it's not...perhaps it'd be clearer to just add some
unique ID code to Android and having no virtual methods rather than
having a unique ID in this file that's actually unused and overridden
on one platform.

+
   //
   // Accessors
   //
 
   BrowserAccessibilityManager* manager() const { return manager_; }
   bool instance_active() const { return node_ && manager_; }
   ui::AXNode* node() const { return node_; }
-  int32_t unique_id() const { return unique_id_; }
 
   // These access the internal accessibility tree, which doesn't necessarily
   // reflect the accessibility tree that should be exposed on each platform.
   // Use PlatformChildCount and PlatformGetChild to implement platform
   // accessibility APIs.
   uint32_t InternalChildCount() const;
   BrowserAccessibility* InternalGetChild(uint32_t child_index) const;
   BrowserAccessibility* InternalGetParent() const;
 
   BrowserAccessibility* PlatformGetParent() const;
@@ skipping 130 matching lines @@
   using AXPlatformRange = ui::AXRange<AXPlatformPositionInstance::element_type>;
 
   BrowserAccessibility();
 
   // The manager of this tree of accessibility objects.
   BrowserAccessibilityManager* manager_;
 
   // The underlying node.
   ui::AXNode* node_;
 
+ private:
   // A unique ID, since node IDs are frame-local.
   int32_t unique_id_;
 
- private:
   // |GetInnerText| recursively includes all the text from descendants such as
   // text found in any embedded object. In contrast, |GetText| might include a
   // special character in the place of every embedded object instead of its
   // text, depending on the platform.
   base::string16 GetInnerText() const;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_