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

Side by Side Diff: chrome/browser/extensions/extension_menu_manager_unittest.cc

Issue 5712003: webkit: use string16 in ContextMenuParams (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: works Created 10 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <vector> 5 #include <vector>
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "base/scoped_vector.h" 10 #include "base/scoped_vector.h"
11 #include "base/utf_string_conversions.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "chrome/browser/browser_thread.h" 13 #include "chrome/browser/browser_thread.h"
13 #include "chrome/browser/extensions/extension_event_router.h" 14 #include "chrome/browser/extensions/extension_event_router.h"
14 #include "chrome/browser/extensions/extension_menu_manager.h" 15 #include "chrome/browser/extensions/extension_menu_manager.h"
15 #include "chrome/browser/extensions/test_extension_prefs.h" 16 #include "chrome/browser/extensions/test_extension_prefs.h"
16 #include "chrome/common/chrome_paths.h" 17 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/extensions/extension.h" 18 #include "chrome/common/extensions/extension.h"
18 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
19 #include "chrome/common/notification_service.h" 20 #include "chrome/common/notification_service.h"
20 #include "chrome/test/testing_profile.h" 21 #include "chrome/test/testing_profile.h"
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 413
413 MockTestingProfile profile; 414 MockTestingProfile profile;
414 415
415 scoped_ptr<MockExtensionEventRouter> mock_event_router( 416 scoped_ptr<MockExtensionEventRouter> mock_event_router(
416 new MockExtensionEventRouter(&profile)); 417 new MockExtensionEventRouter(&profile));
417 418
418 ContextMenuParams params; 419 ContextMenuParams params;
419 params.media_type = WebKit::WebContextMenuData::MediaTypeImage; 420 params.media_type = WebKit::WebContextMenuData::MediaTypeImage;
420 params.src_url = GURL("http://foo.bar/image.png"); 421 params.src_url = GURL("http://foo.bar/image.png");
421 params.page_url = GURL("http://foo.bar"); 422 params.page_url = GURL("http://foo.bar");
422 params.selection_text = L"Hello World"; 423 params.selection_text = ASCIIToUTF16("Hello World");
423 params.is_editable = false; 424 params.is_editable = false;
424 425
425 Extension* extension = AddExtension("test"); 426 Extension* extension = AddExtension("test");
426 ExtensionMenuItem* item = CreateTestItem(extension); 427 ExtensionMenuItem* item = CreateTestItem(extension);
427 ExtensionMenuItem::Id id = item->id(); 428 ExtensionMenuItem::Id id = item->id();
428 ASSERT_TRUE(manager_.AddContextItem(extension, item)); 429 ASSERT_TRUE(manager_.AddContextItem(extension, item));
429 430
430 EXPECT_CALL(profile, GetExtensionEventRouter()) 431 EXPECT_CALL(profile, GetExtensionEventRouter())
431 .Times(1) 432 .Times(1)
432 .WillOnce(Return(mock_event_router.get())); 433 .WillOnce(Return(mock_event_router.get()));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 ASSERT_EQ(id.uid, tmp_id); 465 ASSERT_EQ(id.uid, tmp_id);
465 466
466 std::string tmp; 467 std::string tmp;
467 ASSERT_TRUE(info->GetString("mediaType", &tmp)); 468 ASSERT_TRUE(info->GetString("mediaType", &tmp));
468 ASSERT_EQ("image", tmp); 469 ASSERT_EQ("image", tmp);
469 ASSERT_TRUE(info->GetString("srcUrl", &tmp)); 470 ASSERT_TRUE(info->GetString("srcUrl", &tmp));
470 ASSERT_EQ(params.src_url.spec(), tmp); 471 ASSERT_EQ(params.src_url.spec(), tmp);
471 ASSERT_TRUE(info->GetString("pageUrl", &tmp)); 472 ASSERT_TRUE(info->GetString("pageUrl", &tmp));
472 ASSERT_EQ(params.page_url.spec(), tmp); 473 ASSERT_EQ(params.page_url.spec(), tmp);
473 474
474 ASSERT_TRUE(info->GetString("selectionText", &tmp)); 475 string16 tmp16;
475 ASSERT_EQ(WideToUTF8(params.selection_text), tmp); 476 ASSERT_TRUE(info->GetString("selectionText", &tmp16));
477 ASSERT_EQ(params.selection_text, tmp16);
476 478
477 bool bool_tmp = true; 479 bool bool_tmp = true;
478 ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp)); 480 ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp));
479 ASSERT_EQ(params.is_editable, bool_tmp); 481 ASSERT_EQ(params.is_editable, bool_tmp);
480 } 482 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_menu_manager.cc ('k') | chrome/browser/external_tab_container_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698