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

Side by Side Diff: chrome/browser/importer/profile_writer_unittest.cc

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
« no previous file with comments | « chrome/browser/importer/profile_writer.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/importer/profile_writer.h" 5 #include "chrome/browser/importer/profile_writer.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
12 #include "chrome/browser/history/history_service.h" 12 #include "chrome/browser/history/history_service.h"
13 #include "chrome/browser/history/history_service_factory.h" 13 #include "chrome/browser/history/history_service_factory.h"
14 #include "chrome/browser/history/history_types.h" 14 #include "chrome/browser/history/history_types.h"
15 #include "chrome/browser/importer/importer_unittest_utils.h" 15 #include "chrome/browser/importer/importer_unittest_utils.h"
16 #include "chrome/common/importer/imported_bookmark_entry.h" 16 #include "chrome/common/importer/imported_bookmark_entry.h"
17 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "components/bookmarks/core/browser/bookmark_match.h" 18 #include "components/bookmarks/browser/bookmark_match.h"
19 #include "components/bookmarks/core/browser/bookmark_model.h" 19 #include "components/bookmarks/browser/bookmark_model.h"
20 #include "components/bookmarks/core/browser/bookmark_utils.h" 20 #include "components/bookmarks/browser/bookmark_utils.h"
21 #include "components/bookmarks/core/test/bookmark_test_helpers.h" 21 #include "components/bookmarks/test/bookmark_test_helpers.h"
22 #include "content/public/test/test_browser_thread.h" 22 #include "content/public/test/test_browser_thread.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 using content::BrowserThread; 25 using content::BrowserThread;
26 26
27 class TestProfileWriter : public ProfileWriter { 27 class TestProfileWriter : public ProfileWriter {
28 public: 28 public:
29 explicit TestProfileWriter(Profile* profile) : ProfileWriter(profile) {} 29 explicit TestProfileWriter(Profile* profile) : ProfileWriter(profile) {}
30 protected: 30 protected:
31 virtual ~TestProfileWriter() {} 31 virtual ~TestProfileWriter() {}
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 new TestProfileWriter(&profile)); 204 new TestProfileWriter(&profile));
205 profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED); 205 profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
206 VerifyHistoryCount(&profile); 206 VerifyHistoryCount(&profile);
207 size_t original_history_count = history_count_; 207 size_t original_history_count = history_count_;
208 history_count_ = 0; 208 history_count_ = 0;
209 209
210 profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED); 210 profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
211 VerifyHistoryCount(&profile); 211 VerifyHistoryCount(&profile);
212 EXPECT_EQ(original_history_count, history_count_); 212 EXPECT_EQ(original_history_count, history_count_);
213 } 213 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/profile_writer.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698