chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim_unittest.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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

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 "chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim.h"	5 #include "chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim.h"

6	6

7 #include "base/message_loop.h"	7 #include "base/message_loop.h"

8 #include "base/string16.h"	8 #include "base/string16.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/browser/bookmarks/bookmark_model.h"	10 #include "chrome/browser/bookmarks/bookmark_model.h"

11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

12 #include "chrome/test/base/testing_profile.h"	12 #include "chrome/test/base/testing_profile.h"

13 #include "chrome/test/base/ui_test_utils.h"	13 #include "chrome/test/base/ui_test_utils.h"

14 #include "content/public/browser/browser_thread.h"	14 #include "content/public/browser/browser_thread.h"

15 #include "content/public/test/test_browser_thread.h"	15 #include "content/public/test/test_browser_thread.h"

16 #include "googleurl/src/gurl.h"	16 #include "googleurl/src/gurl.h"

17 #include "testing/gtest/include/gtest/gtest.h"	17 #include "testing/gtest/include/gtest/gtest.h"

18	18

19 class PartnerBookmarksShimTest : public testing::Test {	19 class PartnerBookmarksShimTest : public testing::Test {

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
155 root_partner_node->Add(partner_bookmark1, root_partner_node->child_count());	155 root_partner_node->Add(partner_bookmark1, root_partner_node->child_count());

156	156

157 TestObserver* observer = new TestObserver();	157 TestObserver* observer = new TestObserver();

158 PartnerBookmarksShim* shim = PartnerBookmarksShim::GetInstance();	158 PartnerBookmarksShim* shim = PartnerBookmarksShim::GetInstance();

159 shim->AddObserver(observer);	159 shim->AddObserver(observer);

160 shim->AttachTo(model_, model_->bookmark_bar_node());	160 shim->AttachTo(model_, model_->bookmark_bar_node());

161 ASSERT_FALSE(observer->IsNotifiedOfLoad());	161 ASSERT_FALSE(observer->IsNotifiedOfLoad());

162 shim->SetPartnerBookmarksRoot(root_partner_node);	162 shim->SetPartnerBookmarksRoot(root_partner_node);

163 ASSERT_TRUE(observer->IsNotifiedOfLoad());	163 ASSERT_TRUE(observer->IsNotifiedOfLoad());

164 }	164 }

OLD	NEW