Do not create an incogntio profile as side effect when listing all tabs/windows.
BUG=55479
TEST=DontCreateIncognitoProfile
Review URL: http://codereview.chromium.org/3412005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60039 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 3ebbeed9..f5a5173 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -78,13 +78,17 @@
}
bool ExtensionApiTest::RunExtensionTest(const char* extension_name) {
- return RunExtensionTestImpl(extension_name, "");
+ return RunExtensionTestImpl(extension_name, "", false);
+}
+
+bool ExtensionApiTest::RunExtensionTestIncognito(const char* extension_name) {
+ return RunExtensionTestImpl(extension_name, "", true);
}
bool ExtensionApiTest::RunExtensionSubtest(const char* extension_name,
const std::string& page_url) {
DCHECK(!page_url.empty()) << "Argument page_url is required.";
- return RunExtensionTestImpl(extension_name, page_url);
+ return RunExtensionTestImpl(extension_name, page_url, false);
}
bool ExtensionApiTest::RunPageTest(const std::string& page_url) {
@@ -94,7 +98,8 @@
// Load |extension_name| extension and/or |page_url| and wait for
// PASSED or FAILED notification.
bool ExtensionApiTest::RunExtensionTestImpl(const char* extension_name,
- const std::string& page_url) {
+ const std::string& page_url,
+ bool enable_incognito) {
ResultCatcher catcher;
DCHECK(!std::string(extension_name).empty() || !page_url.empty()) <<
"extension_name and page_url cannot both be empty";
@@ -102,7 +107,10 @@
if (!std::string(extension_name).empty()) {
LOG(INFO) << "Loading Extension: " << extension_name;
- if (!LoadExtension(test_data_dir_.AppendASCII(extension_name))) {
+ bool loaded = enable_incognito ?
+ LoadExtensionIncognito(test_data_dir_.AppendASCII(extension_name)) :
+ LoadExtension(test_data_dir_.AppendASCII(extension_name));
+ if (!loaded) {
message_ = "Failed to load extension.";
return false;
}
