Replace IPC messages in layout_test_render_frame_observer.

content/shell/renderer/layout_test/blink_test_runner.h

 // 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.
 
 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_
 
 #include <deque>
 #include <memory>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "components/test_runner/test_preferences.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "content/public/common/page_state.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/renderer/render_view_observer_tracker.h"
+#include "content/shell/common/layout_test.mojom.h"
 #include "content/shell/common/layout_test/layout_test_bluetooth_fake_adapter_setter.mojom.h"
-#include "content/shell/common/shell_test_configuration.h"
 #include "v8/include/v8.h"
 
 class SkBitmap;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace blink {
 class WebDeviceMotionData;
@@ skipping 134 matching lines @@
   // Resets a RenderView to a known state for layout tests. It is used both when
   // a RenderView is created and when reusing an existing RenderView for the
   // next test case.
   // When reusing an existing RenderView, |for_new_test| should be true, which
   // also resets additional state, like the main frame's name and opener.
   void Reset(bool for_new_test);
 
   void ReportLeakDetectionResult(const LeakDetectionResult& result);
 
   // Message handlers forwarded by LayoutTestRenderFrameObserver.
-  void OnSetTestConfiguration(const ShellTestConfiguration& params);
-  void OnReplicateTestConfiguration(const ShellTestConfiguration& params);
+  void OnSetTestConfiguration(const mojom::ShellTestConfigurationPtr& params);

[Sam McNally, 2017/01/26 23:24:08]

Pass these by value.

[Jia, 2017/01/29 23:14:35]

Done. I used const ref to avoid Clone in some operations, but if it's better to
avoid using pass-by-ref and if clone isn't too expensive (I guess it's
inexpensive here), then I'll use pass-by-value.

+  void OnReplicateTestConfiguration(
+      const mojom::ShellTestConfigurationPtr& params);
   void OnSetupSecondaryRenderer();
 
  private:
   // Message handlers.
   void OnSessionHistory(
       const std::vector<int>& routing_ids,
       const std::vector<std::vector<PageState> >& session_histories,
       const std::vector<unsigned>& current_entry_indexes);
   void OnReset();
   void OnTestFinishedInSecondaryRenderer();
@@ skipping 12 matching lines @@
   void OnPixelsDumpCompleted(const SkBitmap& snapshot);
   void CaptureDumpComplete();
   std::string DumpHistoryForWindow(blink::WebView* web_view);
 
   mojom::LayoutTestBluetoothFakeAdapterSetter&
   GetBluetoothFakeAdapterSetter();
   mojom::LayoutTestBluetoothFakeAdapterSetterPtr bluetooth_fake_adapter_setter_;
 
   test_runner::TestPreferences prefs_;
 
-  ShellTestConfiguration test_config_;
+  mojom::ShellTestConfigurationPtr test_config_;
 
   std::vector<int> routing_ids_;
   std::vector<std::vector<PageState> > session_histories_;
   std::vector<unsigned> current_entry_indexes_;
 
   std::deque<base::Callback<void(const std::vector<std::string>&)>>
       get_bluetooth_events_callbacks_;
 
   bool is_main_window_;
 
   bool focus_on_next_commit_;
 
   std::unique_ptr<test_runner::AppBannerService> app_banner_service_;
 
   std::unique_ptr<LeakDetector> leak_detector_;
 
   DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_