Move more files from chrome/browser/nacl_host/ to components/nacl/browser/

components/nacl/browser/nacl_broker_service_win.h

 // Copyright (c) 2012 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.
 
-#ifndef CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
-#define CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
+#ifndef COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_
+#define COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/nacl_host/nacl_broker_host_win.h"
+#include "components/nacl/browser/nacl_broker_host_win.h"
+
+namespace nacl {
 
 class NaClProcessHost;
 
 class NaClBrokerService {
  public:
   // Returns the NaClBrokerService singleton.
   static NaClBrokerService* GetInstance();
 
   // Can be called several times, must be called before LaunchLoader.
   bool StartBroker();
@@ skipping 23 matching lines @@
   typedef std::map<std::string, base::WeakPtr<NaClProcessHost> >
       PendingLaunchesMap;
   typedef std::map<int, base::WeakPtr<NaClProcessHost> >
       PendingDebugExceptionHandlersMap;
 
   friend struct DefaultSingletonTraits<NaClBrokerService>;
 
   NaClBrokerService();
   ~NaClBrokerService() {}
 
-  NaClBrokerHost* GetBrokerHost();
+  nacl::NaClBrokerHost* GetBrokerHost();

[Mark Seaborn, 2013/11/21 23:47:34]

"nacl::" prefix shouldn't be necessary here since this is inside "namespace
nacl".

 
   int loaders_running_;
   PendingLaunchesMap pending_launches_;
   PendingDebugExceptionHandlersMap pending_debuggers_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClBrokerService);
 };
 
-#endif  // CHROME_BROWSER_NACL_HOST_NACL_BROKER_SERVICE_WIN_H_
+}  // namespace nacl
+
+#endif  // COMPONENTS_NACL_BROWSER_NACL_BROKER_SERVICE_WIN_H_