Move Singleton and related structs to namespace base

ui/base/ime/input_method_auralinux_unittest.cc

 // 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.
 
 #include "ui/base/ime/input_method_auralinux.h"
 
 #include "base/memory/singleton.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/ime/linux/fake_input_method_context.h"
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
 #include "ui/events/event.h"
 
 namespace ui {
 namespace {
 
 const base::char16 kActionCommit = L'C';
 const base::char16 kActionCompositionStart = L'S';
 const base::char16 kActionCompositionUpdate = L'U';
 const base::char16 kActionCompositionEnd = L'E';
 
 class TestResult {
  public:
-  static TestResult* GetInstance() { return Singleton<TestResult>::get(); }
+  static TestResult* GetInstance() {
+    return base::Singleton<TestResult>::get();
+  }
 
   void RecordAction(const base::string16& action) {
     recorded_actions_.push_back(action);
   }
 
   void ExpectAction(const std::string& action) {
     expected_actions_.push_back(base::ASCIIToUTF16(action));
   }
 
   void Verify() {
@@ skipping 713 matching lines @@
   input_method_auralinux_->DispatchKeyEvent(&key);
 
   test_result_->ExpectAction("textinput:c");
   test_result_->ExpectAction("keydown:65");
   test_result_->ExpectAction("keypress:65");
   test_result_->Verify();
 }
 
 }  // namespace
 }  // namespace ui