Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest_util.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/test/nacl/nacl_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 312 matching lines @@
 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() {
   return FILE_PATH_LITERAL("libc-free");
 }
 
 void NaClBrowserTestNonSfiMode::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }
 
-base::FilePath::StringType NaClBrowserTestStatic::Variant() {
-  return FILE_PATH_LITERAL("static");
-}
-
-bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) {
-  *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl"));
-  return true;
-}
-
 base::FilePath::StringType NaClBrowserTestPnaclNonSfi::Variant() {
   return FILE_PATH_LITERAL("nonsfi");
 }
 
 void NaClBrowserTestPnaclNonSfi::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }
+
+base::FilePath::StringType NaClBrowserTestStatic::Variant() {

[Mark Seaborn, 2014/05/01 23:28:33]

No need to move these definitions.

[hidehiko, 2014/05/02 01:32:27]

Done.

+  return FILE_PATH_LITERAL("static");
+}
+
+bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) {
+  *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl"));
+  return true;
+}