Move SetJavaScriptFlags() from webkit to content.

content/shell/renderer/shell_render_process_observer.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 "content/shell/renderer/shell_render_process_observer.h"
 
 #include "base/command_line.h"
+#include "content/child/child_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"
 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
 #include "content/shell/renderer/webkit_test_runner.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/glue/webkit_glue.h"
 
 using blink::WebFrame;
 using blink::WebRuntimeFeatures;
 using WebTestRunner::WebTestDelegate;
 using WebTestRunner::WebTestInterfaces;
 
 namespace content {
 
 namespace {
 ShellRenderProcessObserver* g_instance = NULL;
@@ skipping 29 matching lines @@
   WebKitTestRunner* test_runner = WebKitTestRunner::Get(view);
   test_interfaces_->setWebView(view->GetWebView(), test_runner->proxy());
   main_test_runner_ = test_runner;
 }
 
 void ShellRenderProcessObserver::WebKitInitialized() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return;
 
   // We always expose GC to layout tests.
-  webkit_glue::SetJavaScriptFlags(" --expose-gc");
+  ChildThread::SetJavaScriptFlags(" --expose-gc");

[jochen (gone - plz use gerrit), 2014/01/27 15:08:29]

instead of calling this here, move this to EnableRendererLayoutTestMode()

[tfarina, 2014/01/27 23:35:47]

Done.

 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
     switches::kStableReleaseMode)) {
     WebRuntimeFeatures::enableTestOnlyFeatures(true);
   }
 
   test_interfaces_.reset(new WebTestInterfaces);
   test_interfaces_->resetAll();
 }
 
@@ skipping 11 matching lines @@
 
   return handled;
 }
 
 void ShellRenderProcessObserver::OnSetWebKitSourceDir(
     const base::FilePath& webkit_source_dir) {
   webkit_source_dir_ = webkit_source_dir;
 }
 
 }  // namespace content