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

Unified Diff: chrome/browser/extensions/api/socket/socket_api_unittest.cc

Issue 10830061: Revert 148856 (broke mac, asan, linux cros bots) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/api/socket/socket_api_unittest.cc
===================================================================
--- chrome/browser/extensions/api/socket/socket_api_unittest.cc (revision 148858)
+++ chrome/browser/extensions/api/socket/socket_api_unittest.cc (working copy)
@@ -1,83 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/values.h"
-#include "chrome/browser/browser_process_impl.h"
-#include "chrome/browser/extensions/api/socket/socket_api.h"
-#include "chrome/browser/extensions/extension_function_test_utils.h"
-#include "chrome/browser/extensions/test_extension_system.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/test/base/browser_with_test_window_test.h"
-#include "chrome/test/base/testing_browser_process.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace utils = extension_function_test_utils;
-
-namespace extensions {
-
-class SocketUnitTest : public BrowserWithTestWindowTest {
- public:
- virtual void SetUp() {
- BrowserWithTestWindowTest::SetUp();
-
- TestExtensionSystem* system = static_cast<TestExtensionSystem*>(
- ExtensionSystem::Get(browser()->profile()));
- system->CreateSocketManager();
-
- extension_ = utils::CreateEmptyExtensionWithLocation(
- extensions::Extension::LOAD);
- }
-
- base::Value* RunFunctionWithExtension(
- UIThreadExtensionFunction* function, const std::string& args) {
- function->set_extension(extension_.get());
- return utils::RunFunctionAndReturnSingleResult(function, args, browser());
- }
-
- base::DictionaryValue* RunFunctionAndReturnDict(
- UIThreadExtensionFunction* function, const std::string& args) {
- base::Value* result = RunFunctionWithExtension(function, args);
- return result ? utils::ToDictionary(result) : NULL;
- }
-
- base::ListValue* RunFunctionAndReturnList(
- UIThreadExtensionFunction* function, const std::string& args) {
- base::Value* result = RunFunctionWithExtension(function, args);
- return result ? utils::ToList(result) : NULL;
- }
-
- void RunFunction(UIThreadExtensionFunction* function,
- const std::string& args) {
- scoped_ptr<base::Value> result(RunFunctionWithExtension(function, args));
- }
-
- std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
- const std::string& args) {
- function->set_extension(extension_.get());
- return utils::RunFunctionAndReturnError(function, args, browser());
- }
-
- protected:
- scoped_refptr<extensions::Extension> extension_;
-};
-
-TEST_F(SocketUnitTest, Create) {
- // TODO(miket): enable this test. This will require teaching
- // SocketCreateFunction to do its work on a thread other than IO. Getting
- // this CL landed was hard enough already, so we're going to save this work
- // for another day.
- if (false) {
- scoped_ptr<base::DictionaryValue> result(RunFunctionAndReturnDict(
- new SocketCreateFunction(), "[\"tcp\"]"));
- ASSERT_TRUE(result.get());
- }
- {
- std::string error = RunFunctionAndReturnError(
- new SocketCreateFunction(), "[\"nonexistent-socket-type\"]");
- ASSERT_FALSE(error.empty()) << "Expected error. Got nothing instead.";
- }
-}
-
-} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/api/socket/socket_api.cc ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698