Replicating LayoutDumpFlags across OOPIFs.

content/shell/browser/layout_test/blink_test_controller.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_
 
 #include <map>
 #include <ostream>
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
+#include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/web_preferences.h"
 #include "content/shell/common/leak_detection_result.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(OS_ANDROID)
 #include "base/threading/thread_restrictions.h"
 #endif
 
 class SkBitmap;
 
-namespace test_runner {
-struct LayoutDumpFlags;
-}
-
 namespace url {
 class Origin;
 }
 
 namespace content {
 
 class LayoutTestBluetoothChooserFactory;
 class LayoutTestDevToolsFrontend;
 class RenderFrameHost;
 class RenderProcessHost;
@@ skipping 137 matching lines @@
   static BlinkTestController* instance_;
 
   void DiscardMainWindow();
   void HandleNewRenderFrameHost(
       RenderFrameHost* frame_representing_target_process);
 
   // Message handlers.
   void OnAudioDump(const std::vector<unsigned char>& audio_dump);
   void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
   void OnTextDump(const std::string& dump);
-  void OnInitiateLayoutDump(
-      const test_runner::LayoutDumpFlags& layout_dump_flags);
+  void OnInitiateLayoutDump();
+  void OnLayoutDumpFlagsChanged(
+      RenderFrameHost* sender,
+      const base::DictionaryValue& changed_layout_dump_flags);
   void OnLayoutDumpResponse(RenderFrameHost* sender, const std::string& dump);
   void OnPrintMessage(const std::string& message);
   void OnOverridePreferences(const WebPreferences& prefs);
   void OnTestFinished();
   void OnClearDevToolsLocalStorage();
   void OnShowDevTools(const std::string& settings,
                       const std::string& frontend_url);
   void OnCloseDevTools();
   void OnGoToOffset(int offset);
   void OnReload();
@@ skipping 51 matching lines @@
 
   // Map from frame_tree_node_id into frame-specific dumps.
   std::map<int, std::string> frame_to_layout_dump_map_;
   // Number of ShellViewHostMsg_LayoutDumpResponse messages we are waiting for.
   int pending_layout_dumps_;
 
   // Renderer processes are observed to detect crashes.
   ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
       render_process_host_observer_;
 
+  // Changes reported by OnLayoutDumpFlagsChanged that have accumulated since
+  // PrepareForLayoutTest (i.e. changes that need to be send to a fresh
+  // renderer created while test is in progress).
+  base::DictionaryValue accumulated_layout_dump_flags_changes_;
+
 #if defined(OS_ANDROID)
   // Because of the nested message pump implementation, Android needs to allow
   // waiting on the UI thread while layout tests are being ran.
   ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BlinkTestController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_