Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: content/browser/accessibility/renderer_accessibility_browsertest.cc

Issue 10399084: Fix crash in the accessibility code in the shared build. The problem is that the ATL module pointer… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update license header in atl_module.h Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
11 #include "chrome/test/base/ui_test_utils.h" 11 #include "chrome/test/base/ui_test_utils.h"
12 #include "content/browser/renderer_host/render_view_host_impl.h" 12 #include "content/browser/renderer_host/render_view_host_impl.h"
13 #include "content/public/browser/notification_service.h" 13 #include "content/public/browser/notification_service.h"
14 #include "content/public/browser/notification_types.h" 14 #include "content/public/browser/notification_types.h"
15 #include "content/public/browser/render_widget_host_view.h" 15 #include "content/public/browser/render_widget_host_view.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 17
18 #if defined(OS_WIN) 18 #if defined(OS_WIN)
19 #include <atlbase.h> 19 #include <atlbase.h>
20 #include <atlcom.h> 20 #include <atlcom.h>
21 #include "ui/base/win/atl_module.h" 21 #include "base/win/atl_module.h"
22 #endif 22 #endif
23 23
24 using content::OpenURLParams; 24 using content::OpenURLParams;
25 using content::RenderViewHostImpl; 25 using content::RenderViewHostImpl;
26 using content::RenderWidgetHostImpl; 26 using content::RenderWidgetHostImpl;
27 using content::Referrer; 27 using content::Referrer;
28 using webkit_glue::WebAccessibility; 28 using webkit_glue::WebAccessibility;
29 29
30 namespace { 30 namespace {
31 31
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 const WebAccessibility& text4 = tree.children[4]; 505 const WebAccessibility& text4 = tree.children[4];
506 EXPECT_EQ(WebAccessibility::ROLE_TEXTAREA, text4.role); 506 EXPECT_EQ(WebAccessibility::ROLE_TEXTAREA, text4.role);
507 EXPECT_STREQ("text4", UTF16ToUTF8(text4.value).c_str()); 507 EXPECT_STREQ("text4", UTF16ToUTF8(text4.value).c_str());
508 508
509 const WebAccessibility& text5 = tree.children[5]; 509 const WebAccessibility& text5 = tree.children[5];
510 EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, text5.role); 510 EXPECT_EQ(WebAccessibility::ROLE_TEXT_FIELD, text5.role);
511 EXPECT_STREQ("text5", UTF16ToUTF8(text5.value).c_str()); 511 EXPECT_STREQ("text5", UTF16ToUTF8(text5.value).c_str());
512 } 512 }
513 513
514 } // namespace 514 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698