OLD | NEW |
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/test_extension_environment.h" | 5 #include "chrome/browser/extensions/test_extension_environment.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/extensions/test_extension_system.h" | 12 #include "chrome/browser/extensions/test_extension_system.h" |
13 #include "chrome/browser/sessions/session_tab_helper.h" | 13 #include "chrome/browser/sessions/session_tab_helper.h" |
14 #include "chrome/common/extensions/extension.h" | 14 #include "chrome/common/extensions/extension.h" |
15 #include "chrome/common/extensions/extension_builder.h" | |
16 #include "chrome/common/extensions/value_builder.h" | |
17 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
18 #include "content/public/test/web_contents_tester.h" | 16 #include "content/public/test/web_contents_tester.h" |
| 17 #include "extensions/common/extension_builder.h" |
| 18 #include "extensions/common/value_builder.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
20 | 20 |
21 #if defined(USE_AURA) | 21 #if defined(USE_AURA) |
22 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
23 #endif | 23 #endif |
24 | 24 |
25 namespace extensions { | 25 namespace extensions { |
26 | 26 |
27 using content::BrowserThread; | 27 using content::BrowserThread; |
28 | 28 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 | 91 |
92 scoped_ptr<content::WebContents> TestExtensionEnvironment::MakeTab() const { | 92 scoped_ptr<content::WebContents> TestExtensionEnvironment::MakeTab() const { |
93 scoped_ptr<content::WebContents> contents( | 93 scoped_ptr<content::WebContents> contents( |
94 content::WebContentsTester::CreateTestWebContents(profile(), NULL)); | 94 content::WebContentsTester::CreateTestWebContents(profile(), NULL)); |
95 // Create a tab id. | 95 // Create a tab id. |
96 SessionTabHelper::CreateForWebContents(contents.get()); | 96 SessionTabHelper::CreateForWebContents(contents.get()); |
97 return contents.Pass(); | 97 return contents.Pass(); |
98 } | 98 } |
99 | 99 |
100 } // namespace extensions | 100 } // namespace extensions |
OLD | NEW |