Update from https://crrev.com/309717

tools/clang/blink_gc_plugin/RecordInfo.h

 // 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.
 
 // This file provides a wrapper for CXXRecordDecl that accumulates GC related
 // information about a class. Accumulated information is memoized and the info
 // objects are stored in a RecordCache.
 
 #ifndef TOOLS_BLINK_GC_PLUGIN_RECORD_INFO_H_
 #define TOOLS_BLINK_GC_PLUGIN_RECORD_INFO_H_
@@ skipping 82 matching lines @@
   bool IsNonNewable();
   bool IsOnlyPlacementNewable();
   clang::CXXMethodDecl* DeclaresNewOperator();
 
   bool RequiresTraceMethod();
   bool NeedsFinalization();
   TracingStatus NeedsTracing(Edge::NeedsTracingOption);
   clang::CXXMethodDecl* InheritsNonVirtualTrace();
   bool IsConsideredAbstract();
 
+  static clang::CXXRecordDecl* GetDependentTemplatedDecl(const clang::Type&);
+
  private:
   RecordInfo(clang::CXXRecordDecl* record, RecordCache* cache);
 
+  void walkBases();
+
   Fields* CollectFields();
   Bases* CollectBases();
   void DetermineTracingMethods();
   bool InheritsTrace();
 
   Edge* CreateEdge(const clang::Type* type);
 
   RecordCache* cache_;
   clang::CXXRecordDecl* record_;
   const std::string name_;
   TracingStatus fields_need_tracing_;
   Bases* bases_;
   Fields* fields_;
 
   enum CachedBool { kFalse = 0, kTrue = 1, kNotComputed = 2 };
   CachedBool is_stack_allocated_;
   CachedBool is_non_newable_;
   CachedBool is_only_placement_newable_;
   CachedBool does_need_finalization_;
 
   bool determined_trace_methods_;
   clang::CXXMethodDecl* trace_method_;
   clang::CXXMethodDecl* trace_dispatch_method_;
   clang::CXXMethodDecl* finalize_dispatch_method_;
 
   bool is_gc_derived_;
-  clang::CXXBasePaths* base_paths_;
+
+  std::vector<std::string> gc_base_names_;
 
   friend class RecordCache;
 };
 
 class RecordCache {
  public:
   RecordInfo* Lookup(clang::CXXRecordDecl* record);
 
   RecordInfo* Lookup(const clang::CXXRecordDecl* record) {
     return Lookup(const_cast<clang::CXXRecordDecl*>(record));
@@ skipping 22 matching lines @@
       }
     }
   }
 
  private:
   typedef std::map<clang::CXXRecordDecl*, RecordInfo> Cache;
   Cache cache_;
 };
 
 #endif  // TOOLS_BLINK_GC_PLUGIN_RECORD_INFO_H_