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

Side by Side Diff: chrome/browser/sync/profile_sync_service_bookmark_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
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 // TODO(akalin): This file is basically just a unit test for 5 // TODO(akalin): This file is basically just a unit test for
6 // BookmarkChangeProcessor. Write unit tests for 6 // BookmarkChangeProcessor. Write unit tests for
7 // BookmarkModelAssociator separately. 7 // BookmarkModelAssociator separately.
8 8
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
11 #include <stack> 11 #include <stack>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/message_loop.h" 18 #include "base/message_loop.h"
19 #include "base/string16.h" 19 #include "base/string16.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/stringprintf.h" 21 #include "base/stringprintf.h"
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/utf_string_conversions.h"
23 #include "base/time.h" 24 #include "base/time.h"
24 #include "base/utf_string_conversions.h"
25 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" 25 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
26 #include "chrome/browser/bookmarks/bookmark_model.h" 26 #include "chrome/browser/bookmarks/bookmark_model.h"
27 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 27 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
28 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 28 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
29 #include "chrome/browser/sync/glue/bookmark_model_associator.h" 29 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
30 #include "chrome/browser/sync/glue/data_type_error_handler.h" 30 #include "chrome/browser/sync/glue/data_type_error_handler.h"
31 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h" 31 #include "chrome/browser/sync/glue/data_type_error_handler_mock.h"
32 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
33 #include "chrome/test/base/testing_profile.h" 33 #include "chrome/test/base/testing_profile.h"
34 #include "chrome/test/base/ui_test_utils.h" 34 #include "chrome/test/base/ui_test_utils.h"
(...skipping 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 new_versions[changed_bookmark->id()]); 1914 new_versions[changed_bookmark->id()]);
1915 initial_versions.erase(changed_bookmark->id()); 1915 initial_versions.erase(changed_bookmark->id());
1916 ExpectTransactionVersionMatch(model_->bookmark_bar_node(), initial_versions); 1916 ExpectTransactionVersionMatch(model_->bookmark_bar_node(), initial_versions);
1917 ExpectTransactionVersionMatch(model_->other_node(), initial_versions); 1917 ExpectTransactionVersionMatch(model_->other_node(), initial_versions);
1918 ExpectTransactionVersionMatch(model_->mobile_node(), initial_versions); 1918 ExpectTransactionVersionMatch(model_->mobile_node(), initial_versions);
1919 } 1919 }
1920 1920
1921 } // namespace 1921 } // namespace
1922 1922
1923 } // namespace browser_sync 1923 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698