Refactor embedded structures to top-level scope.

base/debug/activity_analyzer_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_analyzer.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/debug/activity_tracker.h"
@@ skipping 30 matching lines @@
 };
 
 }  // namespace
 
 
 class ActivityAnalyzerTest : public testing::Test {
  public:
   const int kMemorySize = 1 << 10;  // 1MiB
   const int kStackSize  = 1 << 10;  // 1KiB
 
-  using Activity = ThreadActivityAnalyzer::Activity;
-
   ActivityAnalyzerTest() {}
 
   ~ActivityAnalyzerTest() override {
     GlobalActivityTracker* global_tracker = GlobalActivityTracker::Get();
     if (global_tracker) {
       global_tracker->ReleaseTrackerForCurrentThreadForTesting();
       delete global_tracker;
     }
   }
 
@@ skipping 16 matching lines @@
   // TODO(bcwhite): More tests once Analyzer does more.
 }
 
 
 // GlobalActivityAnalyzer tests below.
 
 class SimpleActivityThread : public SimpleThread {
  public:
   SimpleActivityThread(const std::string& name,
                        const void* source,
-                       ThreadActivityTracker::ActivityType activity,
-                       const ThreadActivityTracker::ActivityData& data)
+                       Activity::Type activity,
+                       const ActivityData& data)
       : SimpleThread(name, Options()),
         source_(source),
         activity_(activity),
         data_(data),
         exit_condition_(&lock_) {}
 
   ~SimpleActivityThread() override {}
 
   void Run() override {
     GlobalActivityTracker::Get()
@@ skipping 17 matching lines @@
     exit_ = true;
     exit_condition_.Signal();
   }
 
   void WaitReady() {
     SPIN_FOR_1_SECOND_OR_UNTIL_TRUE(ready_);
   }
 
  private:
   const void* source_;
-  ThreadActivityTracker::ActivityType activity_;
-  ThreadActivityTracker::ActivityData data_;
+  Activity::Type activity_;
+  ActivityData data_;
 
   bool ready_ = false;
   bool exit_ = false;
   Lock lock_;
   ConditionVariable exit_condition_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleActivityThread);
 };
 
 TEST_F(ActivityAnalyzerTest, GlobalAnalyzerConstruction) {
   GlobalActivityTracker::CreateWithLocalMemory(kMemorySize, 0, "", 3);
 
   PersistentMemoryAllocator* allocator =
       GlobalActivityTracker::Get()->allocator();
   GlobalActivityAnalyzer analyzer(WrapUnique(
       new PersistentMemoryAllocator(const_cast<void*>(allocator->data()),
                                     allocator->size(), 0, 0, "", true)));
 
   // The only thread at thois point is the test thread.
   ThreadActivityAnalyzer* ta1 = analyzer.GetFirstAnalyzer();
   ASSERT_TRUE(ta1);
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
   ThreadActivityAnalyzer::ThreadKey tk1 = ta1->GetThreadKey();
   EXPECT_EQ(ta1, analyzer.GetAnalyzerForThread(tk1));
 
   // Create a second thread that will do something.
-  SimpleActivityThread t2("t2", nullptr, ThreadActivityTracker::ACT_TASK,
-                          ThreadActivityTracker::ActivityData::ForTask(11));
+  SimpleActivityThread t2("t2", nullptr, Activity::ACT_TASK,
+                          ActivityData::ForTask(11));
   t2.Start();
   t2.WaitReady();
 
   // Now there should be two.
   EXPECT_TRUE(analyzer.GetFirstAnalyzer());
   EXPECT_TRUE(analyzer.GetNextAnalyzer());
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
 
   // Let thread exit.
   t2.Exit();
   t2.Join();
 
   // Now there should be only one again. Calling GetFirstAnalyzer invalidates
   // any previously returned analyzer pointers.
   ThreadActivityAnalyzer* ta2 = analyzer.GetFirstAnalyzer();
   ASSERT_TRUE(ta2);
   EXPECT_FALSE(analyzer.GetNextAnalyzer());
   ThreadActivityAnalyzer::ThreadKey tk2 = ta2->GetThreadKey();
   EXPECT_EQ(ta2, analyzer.GetAnalyzerForThread(tk2));
   EXPECT_EQ(tk1, tk2);
 }
 
 }  // namespace debug
 }  // namespace base