Change ownership of BookmarkClient

chrome/browser/ui/bookmarks/bookmark_ui_utils_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 
 using base::ASCIIToUTF16;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 class BookmarkUIUtilsTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(BookmarkUIUtilsTest, HasBookmarkURLs) {
-  bookmarks::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(bookmarks::TestBookmarkClient::CreateModel());
 
   std::vector<const BookmarkNode*> nodes;
 
   // This tests that |nodes| contains an URL.
   const BookmarkNode* page1 = model->AddURL(model->bookmark_bar_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("http://google.com"));
   nodes.push_back(page1);
   EXPECT_TRUE(chrome::HasBookmarkURLs(nodes));
@@ skipping 20 matching lines @@
 
   const BookmarkNode* subfolder1 =
       model->AddFolder(folder1, 0, ASCIIToUTF16("Subfolder1"));
 
   // Now add the URL to that |subfolder1|.
   model->AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
   EXPECT_FALSE(chrome::HasBookmarkURLs(nodes));
 }
 
 TEST_F(BookmarkUIUtilsTest, HasBookmarkURLsAllowedInIncognitoMode) {
-  bookmarks::TestBookmarkClient client;
-  scoped_ptr<BookmarkModel> model(client.CreateModel());
+  scoped_ptr<BookmarkModel> model(bookmarks::TestBookmarkClient::CreateModel());
   TestingProfile profile;
 
   std::vector<const BookmarkNode*> nodes;
 
   // This tests that |nodes| contains an disabled-in-incognito URL.
   const BookmarkNode* page1 = model->AddURL(model->bookmark_bar_node(),
                                             0,
                                             ASCIIToUTF16("BookmarkManager"),
                                             GURL("chrome://bookmarks"));
   nodes.push_back(page1);
@@ skipping 38 matching lines @@
   const BookmarkNode* subfolder1 =
       model->AddFolder(folder1, 0, ASCIIToUTF16("Subfolder1"));
 
   // Now add the URL to that |subfolder1|.
   model->AddURL(subfolder1, 0, ASCIIToUTF16("BAR"), GURL("http://bar-foo.com"));
   EXPECT_FALSE(chrome::HasBookmarkURLsAllowedInIncognitoMode(nodes, &profile));
 }
 
 }  // namespace
 #endif