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

Side by Side Diff: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

Issue 23257005: Move Feature and Manifest to top-level extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | Annotate | Revision Log
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #endif 9 #endif
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/win/windows_version.h" 11 #include "base/win/windows_version.h"
12 #include "chrome/browser/extensions/extension_apitest.h" 12 #include "chrome/browser/extensions/extension_apitest.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_test_message_listener.h" 14 #include "chrome/browser/extensions/extension_test_message_listener.h"
15 #include "chrome/browser/extensions/tab_helper.h" 15 #include "chrome/browser/extensions/tab_helper.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 17 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/chrome_version_info.h" 19 #include "chrome/common/chrome_version_info.h"
20 #include "chrome/common/extensions/feature_switch.h" 20 #include "chrome/common/extensions/feature_switch.h"
21 #include "chrome/common/extensions/features/base_feature_provider.h" 21 #include "chrome/common/extensions/features/base_feature_provider.h"
22 #include "chrome/common/extensions/features/complex_feature.h" 22 #include "chrome/common/extensions/features/complex_feature.h"
23 #include "chrome/common/extensions/features/feature.h"
24 #include "chrome/common/extensions/features/simple_feature.h" 23 #include "chrome/common/extensions/features/simple_feature.h"
25 #include "chrome/test/base/test_switches.h" 24 #include "chrome/test/base/test_switches.h"
26 #include "content/public/browser/render_process_host.h" 25 #include "content/public/browser/render_process_host.h"
27 #include "content/public/browser/render_view_host.h" 26 #include "content/public/browser/render_view_host.h"
28 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "extensions/common/features/feature.h"
29 29
30 namespace chrome { 30 namespace chrome {
31 31
32 namespace { 32 namespace {
33 33
34 const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf"; 34 const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf";
35 35
36 class TabCaptureApiTest : public ExtensionApiTest { 36 class TabCaptureApiTest : public ExtensionApiTest {
37 public: 37 public:
38 TabCaptureApiTest() {} 38 TabCaptureApiTest() {}
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, 250 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents,
251 false); 251 false);
252 fullscreen_entered.Reply(""); 252 fullscreen_entered.Reply("");
253 253
254 ResultCatcher catcher; 254 ResultCatcher catcher;
255 catcher.RestrictToProfile(browser()->profile()); 255 catcher.RestrictToProfile(browser()->profile());
256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
257 } 257 }
258 258
259 } // namespace chrome 259 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698