Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / bookmarks / bookmark_menu_bridge_unittest.mm

diff --git a/src/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/src/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index 9946612..77a58df 100644 (file)
--- a/src/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/src/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -8,33 +8,31 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
-#include "grit/generated_resources.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using base::ASCIIToUTF16;
+
 class TestBookmarkMenuBridge : public BookmarkMenuBridge {
  public:
   TestBookmarkMenuBridge(Profile* profile, NSMenu *menu)
       : BookmarkMenuBridge(profile, menu),
         menu_(menu) {
   }
-  virtual ~TestBookmarkMenuBridge() {
-    [menu_ autorelease];
-  }
+  ~TestBookmarkMenuBridge() override { [menu_ autorelease]; }
 
   NSMenu* menu_;
 
  protected:
   // Overridden from BookmarkMenuBridge.
-  virtual NSMenu* BookmarkMenu() OVERRIDE {
-    return menu_;
-  }
+  NSMenu* BookmarkMenu() override { return menu_; }
 };
 
 // TODO(jrg): see refactor comment in bookmark_bar_state_controller_unittest.mm
@@ -94,7 +92,7 @@ class BookmarkMenuBridgeTest : public CocoaProfileTest {
 
 TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) {
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  bridge_->Loaded(model, false);
+  bridge_->BookmarkModelLoaded(model, false);
   NSMenu* menu = bridge_->menu_;
   bridge_->UpdateMenu(menu);
   // The bare menu after loading used to have a separator and an
@@ -141,7 +139,7 @@ TEST_F(BookmarkMenuBridgeTest, TestClearBookmarkMenu) {
 // Test invalidation
 TEST_F(BookmarkMenuBridgeTest, TestInvalidation) {
   BookmarkModel* model = bridge_->GetBookmarkModel();
-  bridge_->Loaded(model, false);
+  bridge_->BookmarkModelLoaded(model, false);
 
   EXPECT_FALSE(menu_is_valid());
   bridge_->UpdateMenu(bridge_->menu_);
@@ -168,7 +166,7 @@ TEST_F(BookmarkMenuBridgeTest, TestInvalidation) {
 // Test that AddNodeToMenu() properly adds bookmark nodes as menus,
 // including the recursive case.
 TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) {
-  string16 empty;
+  base::string16 empty;
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
@@ -311,7 +309,7 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) {
 
 // Makes sure our internal map of BookmarkNode to NSMenuItem works.
 TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) {
-  string16 empty;
+  base::string16 empty;
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();