chrome/browser/sync/about_sync_util_unittest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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/sync/about_sync_util_unittest.cc

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (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 "base/utf_string_conversions.h"	5 #include "base/strings/utf_string_conversions.h"

6 #include "chrome/browser/profiles/profile.h"	6 #include "chrome/browser/profiles/profile.h"

7 #include "chrome/browser/sync/about_sync_util.h"	7 #include "chrome/browser/sync/about_sync_util.h"

8 #include "chrome/browser/sync/profile_sync_service_mock.h"	8 #include "chrome/browser/sync/profile_sync_service_mock.h"

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

10 #include "testing/gmock/include/gmock/gmock.h"	10 #include "testing/gmock/include/gmock/gmock.h"

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

12	12

13 using ::testing::NiceMock;	13 using ::testing::NiceMock;

14 using ::testing::Return;	14 using ::testing::Return;

15 using ::testing::_;	15 using ::testing::_;

(...skipping 25 matching lines...) Expand all Loading...
41 EXPECT_CALL(service, GetLastSyncedTimeString())	41 EXPECT_CALL(service, GetLastSyncedTimeString())

42 .WillOnce(Return(str));	42 .WillOnce(Return(str));

43	43

44 scoped_ptr<DictionaryValue> strings(ConstructAboutInformation(&service));	44 scoped_ptr<DictionaryValue> strings(ConstructAboutInformation(&service));

45	45

46 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected"));	46 EXPECT_TRUE(strings->HasKey("unrecoverable_error_detected"));

47 }	47 }

48	48

49 } // namespace	49 } // namespace

50 } // namespace sync_ui_util	50 } // namespace sync_ui_util

OLD	NEW