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

Side by Side Diff: chrome/test/ppapi/ppapi_test.cc

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « chrome/common/net/x509_certificate_model_unittest.cc ('k') | chromeos/cert_loader_unittest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 16 matching lines...) Expand all
27 #include "components/content_settings/core/browser/host_content_settings_map.h" 27 #include "components/content_settings/core/browser/host_content_settings_map.h"
28 #include "components/infobars/core/confirm_infobar_delegate.h" 28 #include "components/infobars/core/confirm_infobar_delegate.h"
29 #include "components/infobars/core/infobar.h" 29 #include "components/infobars/core/infobar.h"
30 #include "components/nacl/common/nacl_switches.h" 30 #include "components/nacl/common/nacl_switches.h"
31 #include "content/public/browser/notification_service.h" 31 #include "content/public/browser/notification_service.h"
32 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
33 #include "content/public/common/content_switches.h" 33 #include "content/public/common/content_switches.h"
34 #include "content/public/test/ppapi_test_utils.h" 34 #include "content/public/test/ppapi_test_utils.h"
35 #include "media/base/media_switches.h" 35 #include "media/base/media_switches.h"
36 #include "net/base/filename_util.h" 36 #include "net/base/filename_util.h"
37 #include "net/base/test_data_directory.h"
38 #include "net/test/spawned_test_server/spawned_test_server.h" 37 #include "net/test/spawned_test_server/spawned_test_server.h"
38 #include "net/test/test_data_directory.h"
39 #include "ppapi/shared_impl/ppapi_switches.h" 39 #include "ppapi/shared_impl/ppapi_switches.h"
40 #include "ui/gl/gl_switches.h" 40 #include "ui/gl/gl_switches.h"
41 41
42 using content::RenderViewHost; 42 using content::RenderViewHost;
43 using content::TestMessageHandler; 43 using content::TestMessageHandler;
44 44
45 namespace { 45 namespace {
46 46
47 void AddPrivateSwitches(base::CommandLine* command_line) { 47 void AddPrivateSwitches(base::CommandLine* command_line) {
48 // For TestRequestOSFileHandle. 48 // For TestRequestOSFileHandle.
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 const std::string& base, 430 const std::string& base,
431 const std::string& test_case) { 431 const std::string& test_case) {
432 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), 432 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
433 test_case.c_str()); 433 test_case.c_str());
434 } 434 }
435 435
436 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { 436 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() {
437 // The default content setting for the PPAPI broker is ASK. We purposefully 437 // The default content setting for the PPAPI broker is ASK. We purposefully
438 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. 438 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way.
439 } 439 }
OLDNEW
« no previous file with comments | « chrome/common/net/x509_certificate_model_unittest.cc ('k') | chromeos/cert_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698