Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: content/shell/renderer/layout_test/layout_test_render_process_observer.h

Issue 1821413003: Remove logic for lazy initialization of WebKit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H _ 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H _
6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H _ 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVER_H _
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 19 matching lines...) Expand all
30 public: 30 public:
31 static LayoutTestRenderProcessObserver* GetInstance(); 31 static LayoutTestRenderProcessObserver* GetInstance();
32 32
33 LayoutTestRenderProcessObserver(); 33 LayoutTestRenderProcessObserver();
34 ~LayoutTestRenderProcessObserver() override; 34 ~LayoutTestRenderProcessObserver() override;
35 35
36 void SetTestDelegate(test_runner::WebTestDelegate* delegate); 36 void SetTestDelegate(test_runner::WebTestDelegate* delegate);
37 void SetMainWindow(RenderView* view); 37 void SetMainWindow(RenderView* view);
38 38
39 // RenderProcessObserver implementation. 39 // RenderProcessObserver implementation.
40 void WebKitInitialized() override;
41 void OnRenderProcessShutdown() override; 40 void OnRenderProcessShutdown() override;
42 bool OnControlMessageReceived(const IPC::Message& message) override; 41 bool OnControlMessageReceived(const IPC::Message& message) override;
43 42
44 test_runner::WebTestDelegate* test_delegate() const { 43 test_runner::WebTestDelegate* test_delegate() const {
45 return test_delegate_; 44 return test_delegate_;
46 } 45 }
47 test_runner::WebTestInterfaces* test_interfaces() const { 46 test_runner::WebTestInterfaces* test_interfaces() const {
48 return test_interfaces_.get(); 47 return test_interfaces_.get();
49 } 48 }
50 BlinkTestRunner* main_test_runner() const { return main_test_runner_; } 49 BlinkTestRunner* main_test_runner() const { return main_test_runner_; }
51 const base::FilePath& webkit_source_dir() const { return webkit_source_dir_; } 50 const base::FilePath& webkit_source_dir() const { return webkit_source_dir_; }
52 51
53 private: 52 private:
54 // Message handlers. 53 // Message handlers.
55 void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir); 54 void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir);
56 55
57 BlinkTestRunner* main_test_runner_; 56 BlinkTestRunner* main_test_runner_;
58 test_runner::WebTestDelegate* test_delegate_; 57 test_runner::WebTestDelegate* test_delegate_;
59 scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_; 58 scoped_ptr<test_runner::WebTestInterfaces> test_interfaces_;
60 59
61 base::FilePath webkit_source_dir_; 60 base::FilePath webkit_source_dir_;
62 61
63 DISALLOW_COPY_AND_ASSIGN(LayoutTestRenderProcessObserver); 62 DISALLOW_COPY_AND_ASSIGN(LayoutTestRenderProcessObserver);
64 }; 63 };
65 64
66 } // namespace content 65 } // namespace content
67 66
68 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVE R_H_ 67 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_RENDER_PROCESS_OBSERVE R_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698