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 #include "base/prefs/pref_service.h" | |
6 #include "base/values.h" | 5 #include "base/values.h" |
7 #include "build/build_config.h" | 6 #include "build/build_config.h" |
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
9 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 8 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" |
10 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
11 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
13 #include "components/bookmarks/browser/bookmark_model.h" | 12 #include "components/bookmarks/browser/bookmark_model.h" |
14 #include "components/bookmarks/browser/bookmark_node.h" | 13 #include "components/bookmarks/browser/bookmark_node.h" |
15 #include "components/bookmarks/common/bookmark_pref_names.h" | 14 #include "components/bookmarks/common/bookmark_pref_names.h" |
16 #include "components/bookmarks/managed/managed_bookmark_service.h" | 15 #include "components/bookmarks/managed/managed_bookmark_service.h" |
17 #include "components/bookmarks/test/bookmark_test_helpers.h" | 16 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 17 #include "components/prefs/pref_service.h" |
18 | 18 |
19 using bookmarks::BookmarkModel; | 19 using bookmarks::BookmarkModel; |
20 | 20 |
21 // Flaky on Windows and Linux. http://crbug.com/383452 | 21 // Flaky on Windows and Linux. http://crbug.com/383452 |
22 #if defined(OS_WIN) || defined(OS_LINUX) | 22 #if defined(OS_WIN) || defined(OS_LINUX) |
23 #define MAYBE_Bookmarks DISABLED_Bookmarks | 23 #define MAYBE_Bookmarks DISABLED_Bookmarks |
24 #else | 24 #else |
25 #define MAYBE_Bookmarks Bookmarks | 25 #define MAYBE_Bookmarks Bookmarks |
26 #endif | 26 #endif |
27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Bookmarks) { | 27 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Bookmarks) { |
(...skipping 28 matching lines...) Expand all Loading... |
56 node = new base::DictionaryValue(); | 56 node = new base::DictionaryValue(); |
57 node->SetString("name", "Supervised Folder"); | 57 node->SetString("name", "Supervised Folder"); |
58 node->Set("children", new base::ListValue()); | 58 node->Set("children", new base::ListValue()); |
59 list.Append(node); | 59 list.Append(node); |
60 profile->GetPrefs()->Set(bookmarks::prefs::kSupervisedBookmarks, list); | 60 profile->GetPrefs()->Set(bookmarks::prefs::kSupervisedBookmarks, list); |
61 ASSERT_EQ(2, managed->supervised_node()->child_count()); | 61 ASSERT_EQ(2, managed->supervised_node()->child_count()); |
62 } | 62 } |
63 | 63 |
64 ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_; | 64 ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_; |
65 } | 65 } |
OLD | NEW |