Remove 'global' user-data in favor of 'process' user-data.

base/debug/activity_tracker_unittest.cc

 // 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.
 
 #include "base/debug/activity_tracker.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/files/file.h"
@@ skipping 288 matching lines @@
 
 
 // GlobalActivityTracker tests below.
 
 TEST_F(ActivityTrackerTest, BasicTest) {
   GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3, 0);
   GlobalActivityTracker* global = GlobalActivityTracker::Get();
 
   // Ensure the data repositories have backing store, indicated by non-zero ID.
   EXPECT_NE(0U, global->process_data().id());
-  EXPECT_NE(0U, global->global_data().id());
-  EXPECT_NE(global->process_data().id(), global->global_data().id());
 }
 
 class SimpleActivityThread : public SimpleThread {
  public:
   SimpleActivityThread(const std::string& name,
                        const void* origin,
                        Activity::Type activity,
                        const ActivityData& data)
       : SimpleThread(name, Options()),
         origin_(origin),
@@ skipping 172 matching lines @@
   global->allocator()->ChangeType(
       tracker_ref, GlobalActivityTracker::kTypeIdActivityTracker,
       GlobalActivityTracker::kTypeIdActivityTrackerFree, false);
   global->allocator()->ChangeType(
       user_data_ref, GlobalActivityTracker::kTypeIdUserDataRecord,
       GlobalActivityTracker::kTypeIdUserDataRecordFree, false);
 }
 
 }  // namespace debug
 }  // namespace base