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

Side by Side Diff: chrome/browser/extensions/extension_apitest.cc

Issue 11724002: Move ContentScripts out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action
Patch Set: Created 7 years, 9 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 unified diff | Download patch
OLDNEW
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/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "chrome/browser/extensions/api/test/test_api.h" 9 #include "chrome/browser/extensions/api/test/test_api.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/extensions/extension_system.h" 11 #include "chrome/browser/extensions/extension_system.h"
12 #include "chrome/browser/extensions/unpacked_installer.h" 12 #include "chrome/browser/extensions/unpacked_installer.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/extensions/application_launch.h" 15 #include "chrome/browser/ui/extensions/application_launch.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h "
17 #include "chrome/common/extensions/extension.h" 18 #include "chrome/common/extensions/extension.h"
19 #include "chrome/common/extensions/manifest_handler.h"
18 #include "chrome/test/base/ui_test_utils.h" 20 #include "chrome/test/base/ui_test_utils.h"
19 #include "content/public/browser/notification_registrar.h" 21 #include "content/public/browser/notification_registrar.h"
20 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
21 #include "net/base/net_util.h" 23 #include "net/base/net_util.h"
22 #include "net/test/test_server.h" 24 #include "net/test/test_server.h"
23 25
24 namespace { 26 namespace {
25 27
26 const char kTestServerPort[] = "testServer.port"; 28 const char kTestServerPort[] = "testServer.port";
27 const char kTestDataDirectory[] = "testDataDirectory"; 29 const char kTestDataDirectory[] = "testDataDirectory";
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 test_config_->SetInteger(kTestWebSocketPort, 309 test_config_->SetInteger(kTestWebSocketPort,
308 websocket_server_->host_port_pair().port()); 310 websocket_server_->host_port_pair().port());
309 311
310 return true; 312 return true;
311 } 313 }
312 314
313 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) { 315 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
314 ExtensionBrowserTest::SetUpCommandLine(command_line); 316 ExtensionBrowserTest::SetUpCommandLine(command_line);
315 test_data_dir_ = test_data_dir_.AppendASCII("api_test"); 317 test_data_dir_ = test_data_dir_.AppendASCII("api_test");
316 } 318 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698