Implement open_resource in non-SFI mode.

chrome/test/nacl/nacl_browsertest_util.cc

Index: chrome/test/nacl/nacl_browsertest_util.cc
diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc
index 8843aa984344197f1f0362ebd7689697139441a8..c2a976dd8a4164f56b2555fcfc3e407a1721d642 100644
--- a/chrome/test/nacl/nacl_browsertest_util.cc
+++ b/chrome/test/nacl/nacl_browsertest_util.cc
@@ -330,15 +330,6 @@ void NaClBrowserTestNonSfiMode::SetUpCommandLine(
   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");
 }
@@ -348,3 +339,12 @@ void NaClBrowserTestPnaclNonSfi::SetUpCommandLine(
   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;
+}