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

Side by Side Diff: content/public/test/content_browser_test.cc

Issue 284323002: ozone: Remove InputMethodContextFactoryOzone and FakeInputMethodContextOzone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "content/public/test/content_browser_test.h" 5 #include "content/public/test/content_browser_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 11 matching lines...) Expand all
22 #include "net/test/embedded_test_server/embedded_test_server.h" 22 #include "net/test/embedded_test_server/embedded_test_server.h"
23 23
24 #if defined(OS_ANDROID) 24 #if defined(OS_ANDROID)
25 #include "content/shell/app/shell_main_delegate.h" 25 #include "content/shell/app/shell_main_delegate.h"
26 #endif 26 #endif
27 27
28 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
29 #include "base/mac/scoped_nsautorelease_pool.h" 29 #include "base/mac/scoped_nsautorelease_pool.h"
30 #endif 30 #endif
31 31
32 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11) 32 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
33 #include "ui/base/ime/input_method_initializer.h" 33 #include "ui/base/ime/input_method_initializer.h"
34 #endif 34 #endif
35 35
36 namespace content { 36 namespace content {
37 37
38 ContentBrowserTest::ContentBrowserTest() 38 ContentBrowserTest::ContentBrowserTest()
39 : setup_called_(false) { 39 : setup_called_(false) {
40 #if defined(OS_MACOSX) 40 #if defined(OS_MACOSX)
41 // See comment in InProcessBrowserTest::InProcessBrowserTest(). 41 // See comment in InProcessBrowserTest::InProcessBrowserTest().
42 base::FilePath content_shell_path; 42 base::FilePath content_shell_path;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 PathService::Get(base::FILE_EXE, &subprocess_path); 84 PathService::Get(base::FILE_EXE, &subprocess_path);
85 subprocess_path = subprocess_path.DirName().DirName(); 85 subprocess_path = subprocess_path.DirName().DirName();
86 DCHECK_EQ(subprocess_path.BaseName().value(), "Contents"); 86 DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
87 subprocess_path = subprocess_path.Append( 87 subprocess_path = subprocess_path.Append(
88 "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper") ; 88 "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper") ;
89 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath, 89 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
90 subprocess_path); 90 subprocess_path);
91 #endif 91 #endif
92 92
93 // LinuxInputMethodContextFactory has to be initialized. 93 // LinuxInputMethodContextFactory has to be initialized.
94 #if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(USE_X11) 94 #if !defined(OS_CHROMEOS) && defined(OS_LINUX)
95 ui::InitializeInputMethodForTesting(); 95 ui::InitializeInputMethodForTesting();
96 #endif 96 #endif
97 97
98 setup_called_ = true; 98 setup_called_ = true;
99 99
100 BrowserTestBase::SetUp(); 100 BrowserTestBase::SetUp();
101 } 101 }
102 102
103 void ContentBrowserTest::TearDown() { 103 void ContentBrowserTest::TearDown() {
104 BrowserTestBase::TearDown(); 104 BrowserTestBase::TearDown();
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { 166 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
167 return Shell::CreateNewWindow( 167 return Shell::CreateNewWindow(
168 ShellContentBrowserClient::Get()->off_the_record_browser_context(), 168 ShellContentBrowserClient::Get()->off_the_record_browser_context(),
169 GURL(kAboutBlankURL), 169 GURL(kAboutBlankURL),
170 NULL, 170 NULL,
171 MSG_ROUTING_NONE, 171 MSG_ROUTING_NONE,
172 gfx::Size()); 172 gfx::Size());
173 } 173 }
174 174
175 } // namespace content 175 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698