diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 07:42:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 07:42:04 +0000 |
| commit | f7d948cb7b900f9b20a2d66f65f056d58a5912ed (patch) | |
| tree | 1c8e99ca890fb1867cf6cc972357e07f4c89943a | |
| parent | 65a77e405dc41d4c80ad4545eb216ffa8cff2e3c (diff) | |
| download | chromium_src-f7d948cb7b900f9b20a2d66f65f056d58a5912ed.zip chromium_src-f7d948cb7b900f9b20a2d66f65f056d58a5912ed.tar.gz chromium_src-f7d948cb7b900f9b20a2d66f65f056d58a5912ed.tar.bz2 | |
Don't depend on strings from third_party/mozilla/NSPasteboard+Utils.h
They aren't exported and hence not available in the components build.
BUG=90078
TEST=none
Review URL: http://codereview.chromium.org/9701068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127122 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/tab_contents/web_drag_dest_mac_unittest.mm | 17 | ||||
| -rw-r--r-- | content/content_tests.gypi | 5 |
2 files changed, 17 insertions, 5 deletions
diff --git a/content/browser/tab_contents/web_drag_dest_mac_unittest.mm b/content/browser/tab_contents/web_drag_dest_mac_unittest.mm index 88f8282..e48d3ba 100644 --- a/content/browser/tab_contents/web_drag_dest_mac_unittest.mm +++ b/content/browser/tab_contents/web_drag_dest_mac_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,6 +15,13 @@ #import "ui/base/test/ui_cocoa_test_helper.h" #include "webkit/glue/webdropdata.h" +namespace { +NSString* const kCrCorePasteboardFlavorType_url = + @"CorePasteboardFlavorType 0x75726C20"; // 'url ' url +NSString* const kCrCorePasteboardFlavorType_urln = + @"CorePasteboardFlavorType 0x75726C6E"; // 'urln' title +} // namespace + class WebDragDestTest : public RenderViewHostTestHarness { public: virtual void SetUp() { @@ -33,14 +40,14 @@ class WebDragDestTest : public RenderViewHostTestHarness { void PutCoreURLAndTitleOnPasteboard(NSString* urlString, NSString* title, NSPasteboard* pboard) { [pboard - declareTypes:[NSArray arrayWithObjects:kCorePasteboardFlavorType_url, - kCorePasteboardFlavorType_urln, + declareTypes:[NSArray arrayWithObjects:kCrCorePasteboardFlavorType_url, + kCrCorePasteboardFlavorType_urln, nil] owner:nil]; [pboard setString:urlString - forType:kCorePasteboardFlavorType_url]; + forType:kCrCorePasteboardFlavorType_url]; [pboard setString:title - forType:kCorePasteboardFlavorType_urln]; + forType:kCrCorePasteboardFlavorType_urln]; } base::mac::ScopedNSAutoreleasePool pool_; diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 75e36cb..9c1cbe9 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -348,6 +348,11 @@ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', ], }], + ['OS=="mac"', { + # These flags are needed to run the test on Mac. + # Search for comments about "xcode_settings" in chrome_tests.gypi. + 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, + }], ['chromeos==1', { 'sources/': [ ['exclude', '^browser/renderer_host/gtk_key_bindings_handler_unittest.cc'], |