| 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 "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
| 14 #include "extensions/common/switches.h" | 14 #include "extensions/common/switches.h" |
| 15 #include "net/dns/mock_host_resolver.h" | 15 #include "net/dns/mock_host_resolver.h" |
| 16 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 17 | 17 |
| 18 class ExtensionIconSourceTest : public ExtensionApiTest { | 18 class ExtensionIconSourceTest : public ExtensionApiTest { |
| 19 protected: | 19 protected: |
| 20 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 20 virtual void SetUpCommandLine(CommandLine* command_line) override { |
| 21 ExtensionApiTest::SetUpCommandLine(command_line); | 21 ExtensionApiTest::SetUpCommandLine(command_line); |
| 22 command_line->AppendSwitch( | 22 command_line->AppendSwitch( |
| 23 extensions::switches::kAllowLegacyExtensionManifests); | 23 extensions::switches::kAllowLegacyExtensionManifests); |
| 24 } | 24 } |
| 25 }; | 25 }; |
| 26 | 26 |
| 27 // Times out on Mac and Win. http://crbug.com/238705 | 27 // Times out on Mac and Win. http://crbug.com/238705 |
| 28 #if defined(OS_WIN) || defined(OS_MACOSX) | 28 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 29 #define MAYBE_IconsLoaded DISABLED_IconsLoaded | 29 #define MAYBE_IconsLoaded DISABLED_IconsLoaded |
| 30 #else | 30 #else |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // without the management permission. | 105 // without the management permission. |
| 106 ui_test_utils::OpenURLOffTheRecord( | 106 ui_test_utils::OpenURLOffTheRecord( |
| 107 browser()->profile(), | 107 browser()->profile(), |
| 108 GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); | 108 GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); |
| 109 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 109 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
| 110 otr_browser->tab_strip_model()->GetActiveWebContents(), | 110 otr_browser->tab_strip_model()->GetActiveWebContents(), |
| 111 "window.domAutomationController.send(document.title)", | 111 "window.domAutomationController.send(document.title)", |
| 112 &result)); | 112 &result)); |
| 113 EXPECT_EQ(result, "Not Loaded"); | 113 EXPECT_EQ(result, "Not Loaded"); |
| 114 } | 114 } |
| OLD | NEW |