Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / sockets_tcp_server / sockets_tcp_server_api_unittest.cc

diff --git a/src/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc b/src/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
index b81f41a..1a31f09 100644 (file)
--- a/src/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
+++ b/src/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
@@ -4,51 +4,48 @@
 
 #include "base/values.h"
 #include "chrome/browser/browser_process_impl.h"
-#include "chrome/browser/extensions/api/api_function.h"
-#include "chrome/browser/extensions/api/api_resource_manager.h"
-#include "chrome/browser/extensions/api/socket/socket.h"
-#include "chrome/browser/extensions/api/socket/tcp_socket.h"
-#include "chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.h"
 #include "chrome/browser/extensions/extension_api_unittest.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "extensions/browser/api/api_resource_manager.h"
+#include "extensions/browser/api/socket/socket.h"
+#include "extensions/browser/api/socket/tcp_socket.h"
+#include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
-namespace api {
+namespace core_api {
 
-static
-BrowserContextKeyedService* ApiResourceManagerTestFactory(
-    content::BrowserContext* profile) {
+static KeyedService* ApiResourceManagerTestFactory(
+    content::BrowserContext* context) {
   content::BrowserThread::ID id;
   CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
-  return ApiResourceManager<ResumableTCPSocket>::
-      CreateApiResourceManagerForTest(static_cast<Profile*>(profile), id);
+  return ApiResourceManager<
+      ResumableTCPSocket>::CreateApiResourceManagerForTest(context, id);
 }
 
-static
-BrowserContextKeyedService* ApiResourceManagerTestServerFactory(
-    content::BrowserContext* profile) {
+static KeyedService* ApiResourceManagerTestServerFactory(
+    content::BrowserContext* context) {
   content::BrowserThread::ID id;
   CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
-  return ApiResourceManager<ResumableTCPServerSocket>::
-      CreateApiResourceManagerForTest(static_cast<Profile*>(profile), id);
+  return ApiResourceManager<
+      ResumableTCPServerSocket>::CreateApiResourceManagerForTest(context, id);
 }
 
 class SocketsTcpServerUnitTest : public ExtensionApiUnittest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     ExtensionApiUnittest::SetUp();
 
-    ApiResourceManager<ResumableTCPSocket>::GetFactoryInstance()->
-        SetTestingFactoryAndUse(browser()->profile(),
-                                ApiResourceManagerTestFactory);
+    ApiResourceManager<ResumableTCPSocket>::GetFactoryInstance()
+        ->SetTestingFactoryAndUse(browser()->profile(),
+                                  ApiResourceManagerTestFactory);
 
-    ApiResourceManager<ResumableTCPServerSocket>::GetFactoryInstance()->
-        SetTestingFactoryAndUse(browser()->profile(),
-                                ApiResourceManagerTestServerFactory);
+    ApiResourceManager<ResumableTCPServerSocket>::GetFactoryInstance()
+        ->SetTestingFactoryAndUse(browser()->profile(),
+                                  ApiResourceManagerTestServerFactory);
   }
 };
 
@@ -58,7 +55,7 @@ TEST_F(SocketsTcpServerUnitTest, Create) {
   CHECK(content::BrowserThread::GetCurrentThreadIdentifier(&id));
 
   // Create SocketCreateFunction and put it on BrowserThread
-  SocketsTcpServerCreateFunction *function =
+  SocketsTcpServerCreateFunction* function =
       new SocketsTcpServerCreateFunction();
   function->set_work_thread_id(id);
 
@@ -68,5 +65,5 @@ TEST_F(SocketsTcpServerUnitTest, Create) {
   ASSERT_TRUE(result.get());
 }
 
-}  // namespace api
+}  // namespace core_api
 }  // namespace extensions