summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_apitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/extension_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_apitest.cc27
1 files changed, 11 insertions, 16 deletions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 8d072ae..e3534e4 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -80,7 +80,7 @@ void ExtensionApiTest::ResultCatcher::Observe(
case chrome::NOTIFICATION_EXTENSION_TEST_PASSED:
VLOG(1) << "Got EXTENSION_TEST_PASSED notification.";
results_.push_back(true);
- messages_.push_back(std::string());
+ messages_.push_back("");
if (waiting_)
MessageLoopForUI::current()->Quit();
break;
@@ -114,45 +114,41 @@ void ExtensionApiTest::TearDownInProcessBrowserTestFixture() {
}
bool ExtensionApiTest::RunExtensionTest(const char* extension_name) {
- return RunExtensionTestImpl(
- extension_name, std::string(), kFlagEnableFileAccess);
+ return RunExtensionTestImpl(extension_name, "", kFlagEnableFileAccess);
}
bool ExtensionApiTest::RunExtensionTestIncognito(const char* extension_name) {
- return RunExtensionTestImpl(extension_name,
- std::string(),
- kFlagEnableIncognito | kFlagEnableFileAccess);
+ return RunExtensionTestImpl(
+ extension_name, "", kFlagEnableIncognito | kFlagEnableFileAccess);
}
bool ExtensionApiTest::RunExtensionTestIgnoreManifestWarnings(
const char* extension_name) {
return RunExtensionTestImpl(
- extension_name, std::string(), kFlagIgnoreManifestWarnings);
+ extension_name, "", kFlagIgnoreManifestWarnings);
}
bool ExtensionApiTest::RunExtensionTestAllowOldManifestVersion(
const char* extension_name) {
return RunExtensionTestImpl(
extension_name,
- std::string(),
+ "",
kFlagEnableFileAccess | kFlagAllowOldManifestVersions);
}
bool ExtensionApiTest::RunComponentExtensionTest(const char* extension_name) {
- return RunExtensionTestImpl(extension_name,
- std::string(),
- kFlagEnableFileAccess | kFlagLoadAsComponent);
+ return RunExtensionTestImpl(
+ extension_name, "", kFlagEnableFileAccess | kFlagLoadAsComponent);
}
bool ExtensionApiTest::RunExtensionTestNoFileAccess(
const char* extension_name) {
- return RunExtensionTestImpl(extension_name, std::string(), kFlagNone);
+ return RunExtensionTestImpl(extension_name, "", kFlagNone);
}
bool ExtensionApiTest::RunExtensionTestIncognitoNoFileAccess(
const char* extension_name) {
- return RunExtensionTestImpl(
- extension_name, std::string(), kFlagEnableIncognito);
+ return RunExtensionTestImpl(extension_name, "", kFlagEnableIncognito);
}
bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
@@ -178,8 +174,7 @@ bool ExtensionApiTest::RunPageTest(const std::string& page_url,
}
bool ExtensionApiTest::RunPlatformAppTest(const char* extension_name) {
- return RunExtensionTestImpl(
- extension_name, std::string(), kFlagLaunchPlatformApp);
+ return RunExtensionTestImpl(extension_name, "", kFlagLaunchPlatformApp);
}
// Load |extension_name| extension and/or |page_url| and wait for