Switch PPAPITests to run in browser_tests instead of ui_tests. The former is sharded and so tests r…

chrome/browser/chrome_content_browser_client.cc

 // 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 270 matching lines @@
   }
 }
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient() {
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
-
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  std::string allowed_list =
-      command_line.GetSwitchValueASCII(switches::kAllowNaClSocketAPI);
-  if (!allowed_list.empty()) {
-    StringTokenizer t(allowed_list, ",");
-    while (t.GetNext()) {
-      allowed_socket_origins_.insert(t.token());
-    }
-  }
 }
 
 ChromeContentBrowserClient::~ChromeContentBrowserClient() {
 }
 
 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   ChromeBrowserMainParts* main_parts;
   // Construct the Main browser parts based on the OS type.
 #if defined(OS_WIN)
@@ skipping 1214 matching lines @@
 
 bool ChromeContentBrowserClient::AllowSocketAPI(
     content::BrowserContext* browser_context, const GURL& url) {
   if (!url.is_valid())
     return false;
 
   std::string host = url.host();
   if (allowed_socket_origins_.count(host))
     return true;
 
+  // Need to check this now and not on construction because otherwise it won't
+  // work with browser_tests.
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  std::string allowed_list =
+      command_line.GetSwitchValueASCII(switches::kAllowNaClSocketAPI);
+  if (!allowed_list.empty()) {
+    StringTokenizer t(allowed_list, ",");
+    while (t.GetNext()) {
+      if (t.token() == host)
+        return true;
+    }
+  }
+
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile || !profile->GetExtensionService())
     return false;
 
   const Extension* extension = profile->GetExtensionService()->extensions()->
       GetExtensionOrAppByURL(ExtensionURLInfo(url));
   if (!extension)
     return false;
 
   if (extension->HasAPIPermission(ExtensionAPIPermission::kSocket))
@@ skipping 45 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome