OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/apps/app_browsertest_util.h" | 8 #include "chrome/browser/apps/app_browsertest_util.h" |
9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
10 #include "chrome/browser/extensions/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 } | 110 } |
111 | 111 |
112 private: | 112 private: |
113 // GuestViewManager override: | 113 // GuestViewManager override: |
114 virtual void AddGuest(int guest_instance_id, | 114 virtual void AddGuest(int guest_instance_id, |
115 content::WebContents* guest_web_contents) OVERRIDE{ | 115 content::WebContents* guest_web_contents) OVERRIDE{ |
116 extensions::GuestViewManager::AddGuest( | 116 extensions::GuestViewManager::AddGuest( |
117 guest_instance_id, guest_web_contents); | 117 guest_instance_id, guest_web_contents); |
118 web_contents_ = guest_web_contents; | 118 web_contents_ = guest_web_contents; |
119 | 119 |
120 if (message_loop_runner_) | 120 if (message_loop_runner_.get()) |
121 message_loop_runner_->Quit(); | 121 message_loop_runner_->Quit(); |
122 } | 122 } |
123 | 123 |
124 content::WebContents* web_contents_; | 124 content::WebContents* web_contents_; |
125 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; | 125 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; |
126 }; | 126 }; |
127 | 127 |
128 // Test factory for creating test instances of GuestViewManager. | 128 // Test factory for creating test instances of GuestViewManager. |
129 class TestGuestViewManagerFactory : | 129 class TestGuestViewManagerFactory : |
130 public extensions::GuestViewManagerFactory { | 130 public extensions::GuestViewManagerFactory { |
(...skipping 2127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2258 // http://crbug.com/403325 | 2258 // http://crbug.com/403325 |
2259 #define MAYBE_WebViewInBackgroundPage \ | 2259 #define MAYBE_WebViewInBackgroundPage \ |
2260 DISABLED_WebViewInBackgroundPage | 2260 DISABLED_WebViewInBackgroundPage |
2261 #else | 2261 #else |
2262 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage | 2262 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage |
2263 #endif | 2263 #endif |
2264 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { | 2264 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { |
2265 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) | 2265 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) |
2266 << message_; | 2266 << message_; |
2267 } | 2267 } |
OLD | NEW |