| 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/automation/automation_util.h" | 5 #include "chrome/browser/automation/automation_util.h" |
| 6 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 6 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
| 7 #include "chrome/browser/ui/browser_tabstrip.h" | 7 #include "chrome/browser/ui/browser_tabstrip.h" |
| 8 #include "chrome/common/chrome_switches.h" |
| 8 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 9 #include "chrome/test/base/test_launcher_utils.h" | 10 #include "chrome/test/base/test_launcher_utils.h" |
| 10 #include "content/public/browser/notification_service.h" | 11 #include "content/public/browser/notification_service.h" |
| 11 #include "content/public/browser/render_process_host.h" | 12 #include "content/public/browser/render_process_host.h" |
| 12 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
| 13 #include "ui/compositor/compositor_setup.h" | 14 #include "ui/compositor/compositor_setup.h" |
| 14 #include "ui/gl/gl_switches.h" | 15 #include "ui/gl/gl_switches.h" |
| 15 | 16 |
| 16 class WebViewTest : public extensions::PlatformAppBrowserTest { | 17 class WebViewTest : public extensions::PlatformAppBrowserTest { |
| 17 protected: | 18 protected: |
| 18 virtual void SetUpCommandLine(CommandLine* command_line) { | 19 virtual void SetUpCommandLine(CommandLine* command_line) { |
| 19 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); | 20 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); |
| 21 // Enable <webview> for running test. |
| 22 command_line->AppendSwitch(switches::kEnableWebView); |
| 20 #if !defined(OS_MACOSX) | 23 #if !defined(OS_MACOSX) |
| 21 CHECK(test_launcher_utils::OverrideGLImplementation( | 24 CHECK(test_launcher_utils::OverrideGLImplementation( |
| 22 command_line, gfx::kGLImplementationOSMesaName)) << | 25 command_line, gfx::kGLImplementationOSMesaName)) << |
| 23 "kUseGL must not be set by test framework code!"; | 26 "kUseGL must not be set by test framework code!"; |
| 24 #endif | 27 #endif |
| 25 ui::DisableTestCompositor(); | 28 ui::DisableTestCompositor(); |
| 26 } | 29 } |
| 27 }; | 30 }; |
| 28 | 31 |
| 29 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim) { | 32 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim) { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 automation_util::GetCookies(GURL("http://localhost"), | 108 automation_util::GetCookies(GURL("http://localhost"), |
| 106 source1->GetWebContents(), | 109 source1->GetWebContents(), |
| 107 &cookie_size, &cookie_value); | 110 &cookie_size, &cookie_value); |
| 108 EXPECT_EQ("guest1=true", cookie_value); | 111 EXPECT_EQ("guest1=true", cookie_value); |
| 109 | 112 |
| 110 automation_util::GetCookies(GURL("http://localhost"), | 113 automation_util::GetCookies(GURL("http://localhost"), |
| 111 source2->GetWebContents(), | 114 source2->GetWebContents(), |
| 112 &cookie_size, &cookie_value); | 115 &cookie_size, &cookie_value); |
| 113 EXPECT_EQ("guest2=true", cookie_value); | 116 EXPECT_EQ("guest2=true", cookie_value); |
| 114 } | 117 } |
| OLD | NEW |