Move all the layout tests that ran under browser_tests to run under content_browsertests.

content/browser/plugin_browsertest.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
@@ skipping 21 matching lines @@
 namespace content {
 
 class PluginTest : public ContentBrowserTest {
  protected:
   PluginTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // Some NPAPI tests schedule garbage collection to force object tear-down.
     command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc");
 
+#if defined(OS_WIN)
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
-    if (strcmp(test_info->name(), "PrivateEnabled") == 0) {
-      command_line->AppendSwitch(switches::kOffTheRecord);
-    }
-#if defined(OS_WIN)
-    else if (strcmp(test_info->name(), "MediaPlayerNew") == 0) {
+    if (strcmp(test_info->name(), "MediaPlayerNew") == 0) {
       // The installer adds our process names to the registry key below.  Since
       // the installer might not have run on this machine, add it manually.
       base::win::RegKey regkey;
       if (regkey.Open(HKEY_LOCAL_MACHINE,
                       L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList",
                       KEY_WRITE) == ERROR_SUCCESS) {
         regkey.CreateKey(L"BROWSER_TESTS.EXE", KEY_READ);
       }
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
@@ skipping 12 matching lines @@
     command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir);
 #endif
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     FilePath path = GetTestFilePath("", "");
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
   }
 
-  void LoadAndWait(const GURL& url) {
+  static void LoadAndWaitInWindow(Shell* window, const GURL& url) {
     string16 expected_title(ASCIIToUTF16("OK"));
-    TitleWatcher title_watcher(shell()->web_contents(), expected_title);
+    TitleWatcher title_watcher(window->web_contents(), expected_title);
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
-    NavigateToURL(shell(), url);
+    NavigateToURL(window, url);
     string16 title = title_watcher.WaitAndGetTitle();
     if (title == ASCIIToUTF16("plugin_not_found")) {
       const testing::TestInfo* const test_info =
           testing::UnitTest::GetInstance()->current_test_info();
       LOG(INFO) << "PluginTest." << test_info->name() <<
                    " not running because plugin not installed.";
     } else {
       EXPECT_EQ(expected_title, title);
     }
   }
 
+  void LoadAndWait(const GURL& url) {
+    LoadAndWaitInWindow(shell(), url);
+  }
+
   GURL GetURL(const char* filename) {
     return GetTestUrl("npapi", filename);
   }
 
   void NavigateAway() {
     GURL url = GetTestUrl(".", "simple_page.html");
     LoadAndWait(url);
   }
 
   void TestPlugin(const char* filename) {
@@ skipping 218 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PluginTest, PluginThreadAsyncCall) {
   LoadAndWait(GetURL("plugin_thread_async_call.html"));
 }
 
 // Test checking the privacy mode is on.
 // If this flakes on Linux, use http://crbug.com/104380
 IN_PROC_BROWSER_TEST_F(PluginTest, PrivateEnabled) {
   GURL url = GetURL("private.html");
   url = GURL(url.spec() + "?private");
-  LoadAndWait(url);
+  LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url);
 }
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 // Test a browser hang due to special case of multiple
 // plugin instances indulged in sync calls across renderer.
 IN_PROC_BROWSER_TEST_F(PluginTest, MultipleInstancesSyncCalls) {
   LoadAndWait(GetURL("multiple_instances_sync_calls.html"));
 }
 #endif
 
@@ skipping 100 matching lines @@
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
   TestPlugin("Java.html");
 }
 
 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) {
   TestPlugin("silverlight.html");
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace content