OLD | NEW |
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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/content_settings/host_content_settings_map.h" | 13 #include "chrome/browser/content_settings/host_content_settings_map.h" |
14 #include "chrome/browser/infobars/infobar_service.h" | 14 #include "chrome/browser/infobars/infobar_service.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/common/chrome_paths.h" | 18 #include "chrome/common/chrome_paths.h" |
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 const std::string& base, | 461 const std::string& base, |
462 const std::string& test_case) { | 462 const std::string& test_case) { |
463 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), | 463 return base::StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(), |
464 test_case.c_str()); | 464 test_case.c_str()); |
465 } | 465 } |
466 | 466 |
467 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { | 467 void PPAPIBrokerInfoBarTest::SetUpOnMainThread() { |
468 // The default content setting for the PPAPI broker is ASK. We purposefully | 468 // The default content setting for the PPAPI broker is ASK. We purposefully |
469 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. | 469 // don't call PPAPITestBase::SetUpOnMainThread() to keep it that way. |
470 } | 470 } |
OLD | NEW |