6 files changed, 20 insertions, 20 deletions
diff --git a/components/html_viewer/ax_provider_apptest.cc b/components/html_viewer/ax_provider_apptest.cc
index 073926c..11b4cf2 100644
--- a/components/html_viewer/ax_provider_apptest.cc
+++ b/components/html_viewer/ax_provider_apptest.cc
@@ -30,11 +30,13 @@ bool AxTreeContainsText(const Array<AxNodePtr>& tree, const String& text) {
   return false;
 }
 
-// Switch to enable out of process iframes.
-const char kOOPIF[] = "oopifs";
+// Switch to disable out of process iframes.
+const char kDisableOOPIF[] = "disable--oopifs";
 
 bool EnableOOPIFs() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(kOOPIF);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableOOPIF))
+    return false;
+  return true;
 }
 
 class TestFrameTreeServer : public mandoline::FrameTreeServer {
diff --git a/components/html_viewer/html_document_application_delegate.cc b/components/html_viewer/html_document_application_delegate.cc
index c97ce2de..1182fe2 100644
--- a/components/html_viewer/html_document_application_delegate.cc
+++ b/components/html_viewer/html_document_application_delegate.cc
@@ -19,7 +19,11 @@ namespace html_viewer {
 namespace {
 
 bool EnableOOPIFs() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kOOPIF);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableOOPIF)) {
+    return false;
+  }
+  return true;
 }
 
 HTMLFrame* CreateHTMLFrame(HTMLFrame::CreateParams* params) {
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc
index 55688fc..d220dea 100644
--- a/components/html_viewer/html_frame_apptest.cc
+++ b/components/html_viewer/html_frame_apptest.cc
@@ -32,7 +32,7 @@ namespace mojo {
 namespace {
 
 // Switch to enable out of process iframes.
-const char kOOPIF[] = "oopifs";
+const char kDisableOOPIF[] = "disable--oopifs";
 
 const char kAddFrameWithEmptyPageScript[] =
     "var iframe = document.createElement(\"iframe\");"
@@ -40,7 +40,9 @@ const char kAddFrameWithEmptyPageScript[] =
     "document.body.appendChild(iframe);";
 
 bool EnableOOPIFs() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(kOOPIF);
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableOOPIF))
+    return false;
+  return true;
 }
 
 mojo::ApplicationConnection* ApplicationConnectionForFrame(Frame* frame) {
diff --git a/components/html_viewer/html_viewer_switches.cc b/components/html_viewer/html_viewer_switches.cc
index a32056e..ba17238 100644
--- a/components/html_viewer/html_viewer_switches.cc
+++ b/components/html_viewer/html_viewer_switches.cc
@@ -7,7 +7,7 @@
 namespace html_viewer {
 namespace switches {
 
-const char kOOPIF[] = "oopifs";
+const char kDisableOOPIF[] = "disable--oopifs";
 
 const char kOOPIFAlwaysCreateNewFrameTree[] =
     "oopif-always-create-new-frame-tree";
diff --git a/components/html_viewer/html_viewer_switches.h b/components/html_viewer/html_viewer_switches.h
index 68d6b6a..5b3b25d 100644
--- a/components/html_viewer/html_viewer_switches.h
+++ b/components/html_viewer/html_viewer_switches.h
@@ -8,8 +8,8 @@
 namespace html_viewer {
 namespace switches {
 
-// Switch to enable out of process iframes.
-extern const char kOOPIF[];
+// Switch to disable out of process iframes.
+extern const char kDisableOOPIF[];
 
 // If true a new HTMLFrameTreeManager is always created, even if a matching
 // HTMLFrameTreeManager is found. This is useful for tests (or debugging) that
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index 4ecb862..6b2e6c2 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -56,21 +56,13 @@ if config.target_os != config.OS_ANDROID:
       'test': 'mojo:html_viewer_apptests',
       'name': 'mojo:html_viewer_apptests',
       'type': 'gtest_isolated',
-      'args': ['--use-test-config']
+      'args': ['--use-test-config', '--enable-html-viewer-test-interface']
     },
     {
       'test': 'mojo:html_viewer_apptests',
-      'name': 'mojo:html_viewer_apptests OOPIFS',
+      'name': 'mojo:html_viewer_apptests new frame',
       'type': 'gtest_isolated',
-      'args': ['--use-test-config', '--oopifs',
-               '--enable-html-viewer-test-interface']
-    },
-    {
-      'test': 'mojo:html_viewer_apptests',
-      'name': 'mojo:html_viewer_apptests OOPIFS new frame',
-      'type': 'gtest_isolated',
-      'args': ['--use-test-config', '--oopifs',
-               '--oopif-always-create-new-frame-tree',
+      'args': ['--use-test-config', '--oopif-always-create-new-frame-tree',
                '--enable-html-viewer-test-interface']
     },
     {