Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

mojo/message_pump/handle_watcher.cc

 // Copyright 2013 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 "mojo/message_pump/handle_watcher.h"
 
 #include <map>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
@@ skipping 171 matching lines @@
     RequestData() : type(REQUEST_START), stop_id(0), stop_event(NULL) {}
 
     RequestType type;
     WatchData start_data;
     WatcherID stop_id;
     base::WaitableEvent* stop_event;
   };
 
   typedef std::vector<RequestData> Requests;
 
-  friend struct DefaultSingletonTraits<WatcherThreadManager>;
+  friend struct base::DefaultSingletonTraits<WatcherThreadManager>;
 
   WatcherThreadManager();
 
   // Schedules a request on the background thread. See |requests_| for details.
   void AddRequest(const RequestData& data);
 
   // Processes requests added to |requests_|. This is invoked on the backend
   // thread.
   void ProcessRequestsOnBackendThread();
 
@@ skipping 11 matching lines @@
   Requests requests_;
 
   DISALLOW_COPY_AND_ASSIGN(WatcherThreadManager);
 };
 
 WatcherThreadManager::~WatcherThreadManager() {
   thread_.Stop();
 }
 
 WatcherThreadManager* WatcherThreadManager::GetInstance() {
-  return Singleton<WatcherThreadManager>::get();
+  return base::Singleton<WatcherThreadManager>::get();
 }
 
 WatcherID WatcherThreadManager::StartWatching(
     const Handle& handle,
     MojoHandleSignals handle_signals,
     base::TimeTicks deadline,
     const base::Callback<void(MojoResult)>& callback) {
   RequestData request_data;
   request_data.type = REQUEST_START;
   request_data.start_data.id = watcher_id_generator_.GetNext();
@@ skipping 230 matching lines @@
         this, handle, handle_signals, deadline, callback));
   }
 }
 
 void HandleWatcher::Stop() {
   state_.reset();
 }
 
 }  // namespace common
 }  // namespace mojo