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

Side by Side Diff: ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc

Issue 2914103002: Remove usages of XInternAtom (Closed)
Patch Set: Address sadrul and sergeyu comments Created 3 years, 6 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
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ('k') | ui/base/x/selection_owner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" 5 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
6 6
7 // Clean up X11 header polution 7 // Clean up X11 header polution
8 #undef None 8 #undef None
9 #undef Bool 9 #undef Bool
10 10
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/dragdrop/file_info.h" 15 #include "ui/base/dragdrop/file_info.h"
16 #include "ui/base/x/x11_util.h"
16 #include "ui/events/platform/x11/x11_event_source_glib.h" 17 #include "ui/events/platform/x11/x11_event_source_glib.h"
17 #include "url/gurl.h" 18 #include "url/gurl.h"
18 19
19 const char kFileURL[] = "file:///home/user/file.txt"; 20 const char kFileURL[] = "file:///home/user/file.txt";
20 const char kFileName[] = "/home/user/file.txt"; 21 const char kFileName[] = "/home/user/file.txt";
21 const char kGoogleTitle[] = "Google"; 22 const char kGoogleTitle[] = "Google";
22 const char kGoogleURL[] = "http://www.google.com/"; 23 const char kGoogleURL[] = "http://www.google.com/";
23 24
24 namespace ui { 25 namespace ui {
25 26
26 class OSExchangeDataProviderAuraX11Test : public testing::Test { 27 class OSExchangeDataProviderAuraX11Test : public testing::Test {
27 public: 28 public:
28 OSExchangeDataProviderAuraX11Test() : event_source(gfx::GetXDisplay()) {} 29 OSExchangeDataProviderAuraX11Test() : event_source(gfx::GetXDisplay()) {}
29 30
30 void AddURLList(const std::string& list_contents) { 31 void AddURLList(const std::string& list_contents) {
31 std::string contents_copy = list_contents; 32 std::string contents_copy = list_contents;
32 scoped_refptr<base::RefCountedMemory> mem( 33 scoped_refptr<base::RefCountedMemory> mem(
33 base::RefCountedString::TakeString(&contents_copy)); 34 base::RefCountedString::TakeString(&contents_copy));
34 35
35 provider.format_map_.Insert( 36 provider.format_map_.Insert(GetAtom(ui::Clipboard::kMimeTypeURIList), mem);
36 provider.atom_cache_.GetAtom(ui::Clipboard::kMimeTypeURIList),
37 mem);
38 } 37 }
39 38
40 protected: 39 protected:
41 base::MessageLoopForUI message_loop; 40 base::MessageLoopForUI message_loop;
42 X11EventSourceGlib event_source; 41 X11EventSourceGlib event_source;
43 ui::OSExchangeDataProviderAuraX11 provider; 42 ui::OSExchangeDataProviderAuraX11 provider;
44 }; 43 };
45 44
46 TEST_F(OSExchangeDataProviderAuraX11Test, MozillaURL) { 45 TEST_F(OSExchangeDataProviderAuraX11Test, MozillaURL) {
47 // Check that we can get titled entries. 46 // Check that we can get titled entries.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 AddURLList(kFileURL); 118 AddURLList(kFileURL);
120 119
121 EXPECT_FALSE(provider.HasString()); 120 EXPECT_FALSE(provider.HasString());
122 base::string16 out_str; 121 base::string16 out_str;
123 EXPECT_FALSE(provider.GetString(&out_str)); 122 EXPECT_FALSE(provider.GetString(&out_str));
124 123
125 EXPECT_TRUE(provider.HasFile()); 124 EXPECT_TRUE(provider.HasFile());
126 } 125 }
127 126
128 } // namespace ui 127 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ('k') | ui/base/x/selection_owner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698