| 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" | |
| 15 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
| 16 #include "content/public/test/test_utils.h" | 15 #include "content/public/test/test_utils.h" |
| 17 #include "content/public/test/web_contents_tester.h" | 16 #include "content/public/test/web_contents_tester.h" |
| 17 #include "extensions/common/extension.h" |
| 18 #include "extensions/common/extension_builder.h" | 18 #include "extensions/common/extension_builder.h" |
| 19 #include "extensions/common/value_builder.h" | 19 #include "extensions/common/value_builder.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 21 | 21 |
| 22 #if defined(USE_AURA) | 22 #if defined(USE_AURA) |
| 23 #include "ui/aura/env.h" | 23 #include "ui/aura/env.h" |
| 24 #endif | 24 #endif |
| 25 | 25 |
| 26 namespace extensions { | 26 namespace extensions { |
| 27 | 27 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 scoped_ptr<content::WebContents> TestExtensionEnvironment::MakeTab() const { | 94 scoped_ptr<content::WebContents> TestExtensionEnvironment::MakeTab() const { |
| 95 scoped_ptr<content::WebContents> contents( | 95 scoped_ptr<content::WebContents> contents( |
| 96 content::WebContentsTester::CreateTestWebContents(profile(), NULL)); | 96 content::WebContentsTester::CreateTestWebContents(profile(), NULL)); |
| 97 // Create a tab id. | 97 // Create a tab id. |
| 98 SessionTabHelper::CreateForWebContents(contents.get()); | 98 SessionTabHelper::CreateForWebContents(contents.get()); |
| 99 return contents.Pass(); | 99 return contents.Pass(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 } // namespace extensions | 102 } // namespace extensions |
| OLD | NEW |