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

Side by Side Diff: chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc

Issue 327243004: Disable flaky ExtensionApiTest.Bookmarks on Win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « no previous file | no next file » | 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 "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
8 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" 8 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "components/bookmarks/browser/bookmark_model.h" 12 #include "components/bookmarks/browser/bookmark_model.h"
13 #include "components/bookmarks/browser/bookmark_node.h" 13 #include "components/bookmarks/browser/bookmark_node.h"
14 #include "components/bookmarks/common/bookmark_pref_names.h" 14 #include "components/bookmarks/common/bookmark_pref_names.h"
15 #include "components/bookmarks/test/bookmark_test_helpers.h" 15 #include "components/bookmarks/test/bookmark_test_helpers.h"
16 16
17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Bookmarks) { 17 // Flaky on Win only. http://crbug.com/383452
18 #if defined(OS_WIN)
19 #define MAYBE_Bookmarks DISABLED_Bookmarks
20 #else
21 #define MAYBE_Bookmarks Bookmarks
22 #endif
23 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Bookmarks) {
18 // Add test managed bookmarks to verify that the bookmarks API can read them 24 // Add test managed bookmarks to verify that the bookmarks API can read them
19 // and can't modify them. 25 // and can't modify them.
20 Profile* profile = browser()->profile(); 26 Profile* profile = browser()->profile();
21 ChromeBookmarkClient* client = 27 ChromeBookmarkClient* client =
22 BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile); 28 BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile);
23 BookmarkModel* model = client->model(); 29 BookmarkModel* model = client->model();
24 test::WaitForBookmarkModelToLoad(model); 30 test::WaitForBookmarkModelToLoad(model);
25 31
26 base::ListValue list; 32 base::ListValue list;
27 base::DictionaryValue* node = new base::DictionaryValue(); 33 base::DictionaryValue* node = new base::DictionaryValue();
28 node->SetString("name", "Managed Bookmark"); 34 node->SetString("name", "Managed Bookmark");
29 node->SetString("url", "http://www.chromium.org"); 35 node->SetString("url", "http://www.chromium.org");
30 list.Append(node); 36 list.Append(node);
31 node = new base::DictionaryValue(); 37 node = new base::DictionaryValue();
32 node->SetString("name", "Managed Folder"); 38 node->SetString("name", "Managed Folder");
33 node->Set("children", new base::ListValue()); 39 node->Set("children", new base::ListValue());
34 list.Append(node); 40 list.Append(node);
35 profile->GetPrefs()->Set(prefs::kManagedBookmarks, list); 41 profile->GetPrefs()->Set(prefs::kManagedBookmarks, list);
36 ASSERT_EQ(2, client->managed_node()->child_count()); 42 ASSERT_EQ(2, client->managed_node()->child_count());
37 43
38 ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_; 44 ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_;
39 } 45 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698