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

components/nacl/browser/nacl_broker_service_win.h

Index: components/nacl/browser/nacl_broker_service_win.h
diff --git a/chrome/browser/nacl_host/nacl_broker_service_win.h b/components/nacl/browser/nacl_broker_service_win.h
similarity index 85%
rename from chrome/browser/nacl_host/nacl_broker_service_win.h
rename to components/nacl/browser/nacl_broker_service_win.h
index 2e1cf8d67ec59fefe2effc0b8041a2550b8f0692..0657211dcbe67fc1323f44fd636800a02f6ac2f0 100644
--- a/chrome/browser/nacl_host/nacl_broker_service_win.h
+++ b/components/nacl/browser/nacl_broker_service_win.h
@@ -2,15 +2,17 @@
 // 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;
 
@@ -54,7 +56,7 @@ class 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_;
@@ -63,4 +65,6 @@ class NaClBrokerService {
   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_