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

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

Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/menu_manager.cc ('k') | chrome/browser/extensions/policy_handlers.cc » ('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 (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 <vector> 5 #include <vector>
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 &profile, 596 &profile,
597 GURL(), 597 GURL(),
598 EventRouter::USER_GESTURE_ENABLED)) 598 EventRouter::USER_GESTURE_ENABLED))
599 .Times(1) 599 .Times(1)
600 .WillOnce(DeleteArg<2>()); 600 .WillOnce(DeleteArg<2>());
601 } 601 }
602 manager_.ExecuteCommand(&profile, NULL /* web_contents */, params, id); 602 manager_.ExecuteCommand(&profile, NULL /* web_contents */, params, id);
603 603
604 ASSERT_EQ(2u, list->GetSize()); 604 ASSERT_EQ(2u, list->GetSize());
605 605
606 DictionaryValue* info; 606 base::DictionaryValue* info;
607 ASSERT_TRUE(list->GetDictionary(0, &info)); 607 ASSERT_TRUE(list->GetDictionary(0, &info));
608 608
609 int tmp_id = 0; 609 int tmp_id = 0;
610 ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id)); 610 ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id));
611 ASSERT_EQ(id.uid, tmp_id); 611 ASSERT_EQ(id.uid, tmp_id);
612 ASSERT_TRUE(info->GetInteger("parentMenuItemId", &tmp_id)); 612 ASSERT_TRUE(info->GetInteger("parentMenuItemId", &tmp_id));
613 ASSERT_EQ(parent_id.uid, tmp_id); 613 ASSERT_EQ(parent_id.uid, tmp_id);
614 614
615 std::string tmp; 615 std::string tmp;
616 ASSERT_TRUE(info->GetString("mediaType", &tmp)); 616 ASSERT_TRUE(info->GetString("mediaType", &tmp));
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size()); 751 EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
752 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size()); 752 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
753 753
754 // Remove all context menu items with incognito true. 754 // Remove all context menu items with incognito true.
755 manager_.RemoveAllIncognitoContextItems(); 755 manager_.RemoveAllIncognitoContextItems();
756 EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size()); 756 EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
757 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size()); 757 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
758 } 758 }
759 759
760 } // namespace extensions 760 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/menu_manager.cc ('k') | chrome/browser/extensions/policy_handlers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698