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

Side by Side Diff: chrome/browser/ui/cocoa/cocoa_profile_test.mm

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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
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 "chrome/browser/ui/cocoa/cocoa_profile_test.h" 5 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 8 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/search_engines/template_url_service_factory.h" 11 #include "chrome/browser/search_engines/template_url_service_factory.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/browser_tabstrip.h" 14 #include "chrome/browser/ui/browser_tabstrip.h"
15 #include "chrome/browser/ui/host_desktop.h" 15 #include "chrome/browser/ui/host_desktop.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/test/base/testing_browser_process.h" 17 #include "chrome/test/base/testing_browser_process.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "components/bookmarks/core/test/bookmark_test_helpers.h" 19 #include "components/bookmarks/test/bookmark_test_helpers.h"
20 #include "content/public/test/test_browser_thread_bundle.h" 20 #include "content/public/test/test_browser_thread_bundle.h"
21 21
22 CocoaProfileTest::CocoaProfileTest() 22 CocoaProfileTest::CocoaProfileTest()
23 : profile_manager_(TestingBrowserProcess::GetGlobal()), 23 : profile_manager_(TestingBrowserProcess::GetGlobal()),
24 profile_(NULL), 24 profile_(NULL),
25 thread_bundle_(new content::TestBrowserThreadBundle) {} 25 thread_bundle_(new content::TestBrowserThreadBundle) {}
26 26
27 CocoaProfileTest::~CocoaProfileTest() { 27 CocoaProfileTest::~CocoaProfileTest() {
28 // Delete the testing profile on the UI thread. But first release the 28 // Delete the testing profile on the UI thread. But first release the
29 // browser, since it may trigger accesses to the profile upon destruction. 29 // browser, since it may trigger accesses to the profile upon destruction.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 browser_->tab_strip_model()->CloseAllTabs(); 80 browser_->tab_strip_model()->CloseAllTabs();
81 chrome::CloseWindow(browser_.get()); 81 chrome::CloseWindow(browser_.get());
82 // |browser_| will be deleted by its BrowserWindowController. 82 // |browser_| will be deleted by its BrowserWindowController.
83 ignore_result(browser_.release()); 83 ignore_result(browser_.release());
84 } 84 }
85 85
86 Browser* CocoaProfileTest::CreateBrowser() { 86 Browser* CocoaProfileTest::CreateBrowser() {
87 return new Browser(Browser::CreateParams(profile(), 87 return new Browser(Browser::CreateParams(profile(),
88 chrome::GetActiveDesktop())); 88 chrome::GetActiveDesktop()));
89 } 89 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.h ('k') | chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698