| OLD | NEW | 
|---|
| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> | 
| 6 | 6 | 
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" | 
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" | 
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" | 
| 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
| 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" | 
| 12 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 12 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 13 #include "chrome/test/base/testing_profile.h" | 13 #include "chrome/test/base/testing_profile.h" | 
| 14 #include "components/bookmarks/browser/bookmark_model.h" | 14 #include "components/bookmarks/browser/bookmark_model.h" | 
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" | 
| 16 #import "testing/gtest_mac.h" | 16 #import "testing/gtest_mac.h" | 
| 17 #include "testing/platform_test.h" | 17 #include "testing/platform_test.h" | 
| 18 | 18 | 
| 19 using base::ASCIIToUTF16; | 19 using base::ASCIIToUTF16; | 
| 20 using bookmarks::BookmarkModel; | 20 using bookmarks::BookmarkModel; | 
| 21 using bookmarks::BookmarkNode; | 21 using bookmarks::BookmarkNode; | 
| 22 | 22 | 
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 519 | 519 | 
| 520 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) { | 520 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) { | 
| 521   [controller_ setDisplayName:@"NEW BOOKMARK"]; | 521   [controller_ setDisplayName:@"NEW BOOKMARK"]; | 
| 522   [controller_ setDisplayURL:@"http://NEWURL.com"]; | 522   [controller_ setDisplayURL:@"http://NEWURL.com"]; | 
| 523   [controller_ ok:nil]; | 523   [controller_ ok:nil]; | 
| 524   const BookmarkNode* new_node = folder_bb_->GetChild(5); | 524   const BookmarkNode* new_node = folder_bb_->GetChild(5); | 
| 525   ASSERT_EQ(0, new_node->child_count()); | 525   ASSERT_EQ(0, new_node->child_count()); | 
| 526   EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK")); | 526   EXPECT_EQ(new_node->GetTitle(), ASCIIToUTF16("NEW BOOKMARK")); | 
| 527   EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com")); | 527   EXPECT_EQ(new_node->url(), GURL("http://NEWURL.com")); | 
| 528 } | 528 } | 
| OLD | NEW | 
|---|