| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/extensions/extension_web_ui.h" | 8 #include "chrome/browser/extensions/extension_web_ui.h" |
| 9 #include "chrome/browser/extensions/test_extension_system.h" | 9 #include "chrome/browser/extensions/test_extension_system.h" |
| 10 #include "chrome/test/base/testing_profile.h" | 10 #include "chrome/test/base/testing_profile.h" |
| 11 #include "content/public/test/test_browser_thread.h" | 11 #include "content/public/test/test_browser_thread.h" |
| 12 #include "extensions/browser/extension_system.h" | 12 #include "extensions/browser/extension_system.h" |
| 13 #include "extensions/common/extension.h" | 13 #include "extensions/common/extension.h" |
| 14 #include "extensions/common/extension_builder.h" | 14 #include "extensions/common/extension_builder.h" |
| 15 #include "extensions/common/manifest_constants.h" | 15 #include "extensions/common/manifest_constants.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| 17 | 17 |
| 18 #if defined(OS_CHROMEOS) | 18 #if defined(OS_CHROMEOS) |
| 19 #include "chrome/browser/chromeos/login/users/user_manager.h" | 19 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h" |
| 20 #include "chrome/browser/chromeos/settings/cros_settings.h" | 20 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 21 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 21 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| 22 #include "components/user_manager/user_manager.h" |
| 22 #endif | 23 #endif |
| 23 | 24 |
| 24 namespace extensions { | 25 namespace extensions { |
| 25 | 26 |
| 26 class ExtensionWebUITest : public testing::Test { | 27 class ExtensionWebUITest : public testing::Test { |
| 27 public: | 28 public: |
| 28 ExtensionWebUITest() | 29 ExtensionWebUITest() |
| 29 : ui_thread_(content::BrowserThread::UI, &message_loop_) {} | 30 : ui_thread_(content::BrowserThread::UI, &message_loop_) {} |
| 30 | 31 |
| 31 protected: | 32 protected: |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 // This time the non-component extension was registered more recently and | 111 // This time the non-component extension was registered more recently and |
| 111 // should still take precedence. | 112 // should still take precedence. |
| 112 ExtensionWebUI::RegisterChromeURLOverrides( | 113 ExtensionWebUI::RegisterChromeURLOverrides( |
| 113 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get())); | 114 profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get())); |
| 114 url = GURL("chrome://bookmarks"); | 115 url = GURL("chrome://bookmarks"); |
| 115 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get())); | 116 EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get())); |
| 116 EXPECT_EQ(url, expected_unpacked_override_url); | 117 EXPECT_EQ(url, expected_unpacked_override_url); |
| 117 } | 118 } |
| 118 | 119 |
| 119 } // namespace extensions | 120 } // namespace extensions |
| OLD | NEW |