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

Side by Side Diff: content/test/test_blink_web_unit_test_support.cc

Issue 2316043002: //content: Change ScopedTempDir::path() to GetPath() (Closed)
Patch Set: Just rebased Created 4 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/test_blink_web_unit_test_support.h" 5 #include "content/test/test_blink_web_unit_test_support.h"
6 6
7 #include "base/feature_list.h" 7 #include "base/feature_list.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 std::numeric_limits<double>::infinity()); 128 std::numeric_limits<double>::infinity());
129 129
130 // Initialize libraries for media. 130 // Initialize libraries for media.
131 media::InitializeMediaLibrary(); 131 media::InitializeMediaLibrary();
132 132
133 file_utilities_.set_sandbox_enabled(false); 133 file_utilities_.set_sandbox_enabled(false);
134 134
135 if (!file_system_root_.CreateUniqueTempDir()) { 135 if (!file_system_root_.CreateUniqueTempDir()) {
136 LOG(WARNING) << "Failed to create a temp dir for the filesystem." 136 LOG(WARNING) << "Failed to create a temp dir for the filesystem."
137 "FileSystem feature will be disabled."; 137 "FileSystem feature will be disabled.";
138 DCHECK(file_system_root_.path().empty()); 138 DCHECK(file_system_root_.GetPath().empty());
139 } 139 }
140 140
141 #if defined(OS_WIN) 141 #if defined(OS_WIN)
142 // Ensure we pick up the default theme engine. 142 // Ensure we pick up the default theme engine.
143 SetThemeEngine(NULL); 143 SetThemeEngine(NULL);
144 #endif 144 #endif
145 145
146 // Test shell always exposes the GC. 146 // Test shell always exposes the GC.
147 std::string flags("--expose-gc"); 147 std::string flags("--expose-gc");
148 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size())); 148 v8::V8::SetFlagsFromString(flags.c_str(), static_cast<int>(flags.size()));
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 void TestBlinkWebUnitTestSupport::getPluginList( 288 void TestBlinkWebUnitTestSupport::getPluginList(
289 bool refresh, 289 bool refresh,
290 const blink::WebSecurityOrigin& mainFrameOrigin, 290 const blink::WebSecurityOrigin& mainFrameOrigin,
291 blink::WebPluginListBuilder* builder) { 291 blink::WebPluginListBuilder* builder) {
292 builder->addPlugin("pdf", "pdf", "pdf-files"); 292 builder->addPlugin("pdf", "pdf", "pdf-files");
293 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); 293 builder->addMediaTypeToLastPlugin("application/pdf", "pdf");
294 } 294 }
295 295
296 } // namespace content 296 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/layout_test/layout_test_browser_main.cc ('k') | content/test/test_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698