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

Side by Side Diff: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h" 10 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manage r_private_api.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
17 #include "components/user_prefs/user_prefs.h"
17 18
18 // Times out on win asan, http://crbug.com/166026 19 // Times out on win asan, http://crbug.com/166026
19 #if defined(OS_WIN) && defined(ADDRESS_SANITIZER) 20 #if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
20 #define MAYBE_BookmarkManager DISABLED_BookmarkManager 21 #define MAYBE_BookmarkManager DISABLED_BookmarkManager
21 #else 22 #else
22 #define MAYBE_BookmarkManager BookmarkManager 23 #define MAYBE_BookmarkManager BookmarkManager
23 #endif 24 #endif
24 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_BookmarkManager) { 25 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_BookmarkManager) {
25 CommandLine::ForCurrentProcess()->AppendSwitch( 26 CommandLine::ForCurrentProcess()->AppendSwitch(
26 switches::kEnableExperimentalExtensionApis); 27 switches::kEnableExperimentalExtensionApis);
(...skipping 10 matching lines...) Expand all
37 38
38 // Provide some testing data here, since bookmark editing will be disabled 39 // Provide some testing data here, since bookmark editing will be disabled
39 // within the extension. 40 // within the extension.
40 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); 41 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
41 ui_test_utils::WaitForBookmarkModelToLoad(model); 42 ui_test_utils::WaitForBookmarkModelToLoad(model);
42 const BookmarkNode* bar = model->bookmark_bar_node(); 43 const BookmarkNode* bar = model->bookmark_bar_node();
43 const BookmarkNode* folder = model->AddFolder(bar, 0, ASCIIToUTF16("Folder")); 44 const BookmarkNode* folder = model->AddFolder(bar, 0, ASCIIToUTF16("Folder"));
44 model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com")); 45 model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com"));
45 model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com")); 46 model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com"));
46 47
47 PrefService* prefs = PrefServiceFromBrowserContext(profile); 48 PrefService* prefs = components::UserPrefs::Get(profile);
48 prefs->SetBoolean(prefs::kEditBookmarksEnabled, false); 49 prefs->SetBoolean(prefs::kEditBookmarksEnabled, false);
49 50
50 ASSERT_TRUE(RunComponentExtensionTest("bookmark_manager/edit_disabled")) 51 ASSERT_TRUE(RunComponentExtensionTest("bookmark_manager/edit_disabled"))
51 << message_; 52 << message_;
52 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698