Merge 32271 - Don't allow content scripts to execute on file:// urls....

chrome/test/page_cycler/page_cycler_test.cc

 // Copyright (c) 2006-2009 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 144 matching lines @@
  protected:
   rlim_t fd_limit_;
 #endif
  public:
   PageCyclerTest() {
     show_window_ = true;
 
     // Expose garbage collection for the page cycler tests.
     launch_arguments_.AppendSwitchWithValue(switches::kJavaScriptFlags,
                                             L"--expose_gc");
+    // Page cycler tests need to run content scripts on file:// urls.
+    launch_arguments_.AppendSwitch(switches::kEnableJsOnFileUrls);
+
 #if defined(OS_MACOSX)
     static rlim_t initial_fd_limit = GetFileDescriptorLimit();
     fd_limit_ = initial_fd_limit;
 #endif
   }
 
   void SetUp() {
 #if defined(OS_MACOSX)
     SetFileDescriptorLimit(fd_limit_);
 #endif
@@ skipping 320 matching lines @@
 
 // http (localhost) tests
 PAGE_CYCLER_HTTP_TESTS("moz", MozHttp);
 PAGE_CYCLER_HTTP_TESTS("intl1", Intl1Http);
 PAGE_CYCLER_HTTP_TESTS("intl2", Intl2Http);
 PAGE_CYCLER_HTTP_TESTS("dom", DomHttp);
 PAGE_CYCLER_HTTP_TESTS("bloat", BloatHttp);
 
 
 }  // namespace