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

Unified Diff: chrome/browser/extensions/extension_api_unittest.cc

Issue 789643004: Move chrome.alarms API from chrome/ to extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_api_unittest.cc
diff --git a/chrome/browser/extensions/extension_api_unittest.cc b/chrome/browser/extensions/extension_api_unittest.cc
index 9b4392fe45948bca96fe2a9d8db9e0ef996bc685..814a98473c8a922a5e24096aeaad122e52fa3568 100644
--- a/chrome/browser/extensions/extension_api_unittest.cc
+++ b/chrome/browser/extensions/extension_api_unittest.cc
@@ -7,9 +7,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/common/url_constants.h"
+#include "extensions/browser/api_test_utils.h"
#include "extensions/browser/extension_function.h"
#include "extensions/common/extension.h"
#include "extensions/common/manifest.h"
@@ -19,7 +17,7 @@ namespace utils = extension_function_test_utils;
namespace extensions {
-ExtensionApiUnittest::ExtensionApiUnittest() : contents_(NULL) {
+ExtensionApiUnittest::ExtensionApiUnittest() {
}
ExtensionApiUnittest::~ExtensionApiUnittest() {
@@ -27,24 +25,13 @@ ExtensionApiUnittest::~ExtensionApiUnittest() {
void ExtensionApiUnittest::SetUp() {
BrowserWithTestWindowTest::SetUp();
- extension_ = utils::CreateEmptyExtensionWithLocation(Manifest::UNPACKED);
-}
-
-void ExtensionApiUnittest::CreateBackgroundPage() {
- if (!contents_) {
- GURL url = BackgroundInfo::GetBackgroundURL(extension());
- if (url.is_empty())
- url = GURL(url::kAboutBlankURL);
- AddTab(browser(), url);
- contents_ = browser()->tab_strip_model()->GetActiveWebContents();
- }
+ extension_ = api_test_utils::CreateEmptyExtensionWithLocation(
+ Manifest::UNPACKED);
}
scoped_ptr<base::Value> ExtensionApiUnittest::RunFunctionAndReturnValue(
UIThreadExtensionFunction* function, const std::string& args) {
function->set_extension(extension());
- if (contents_)
- function->SetRenderViewHost(contents_->GetRenderViewHost());
return scoped_ptr<base::Value>(
utils::RunFunctionAndReturnSingleResult(function, args, browser()));
}
@@ -81,8 +68,6 @@ scoped_ptr<base::ListValue> ExtensionApiUnittest::RunFunctionAndReturnList(
std::string ExtensionApiUnittest::RunFunctionAndReturnError(
UIThreadExtensionFunction* function, const std::string& args) {
function->set_extension(extension());
- if (contents_)
- function->SetRenderViewHost(contents_->GetRenderViewHost());
return utils::RunFunctionAndReturnError(function, args, browser());
}
« no previous file with comments | « chrome/browser/extensions/extension_api_unittest.h ('k') | chrome/browser/extensions/extension_function_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698