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

Side by Side Diff: chrome/browser/history/web_history_service_unittest.cc

Issue 1419103009: [Sync] Componentize ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@max_bogue_sync_backend_host
Patch Set: Rebase Created 5 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/history/core/browser/web_history_service.h" 5 #include "components/history/core/browser/web_history_service.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/thread_task_runner_handle.h"
12 #include "chrome/browser/history/web_history_service_factory.h" 12 #include "chrome/browser/history/web_history_service_factory.h"
13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
14 #include "chrome/browser/signin/signin_manager_factory.h" 14 #include "chrome/browser/signin/signin_manager_factory.h"
15 #include "chrome/browser/sync/profile_sync_service.h"
16 #include "chrome/browser/sync/profile_sync_service_factory.h" 15 #include "chrome/browser/sync/profile_sync_service_factory.h"
17 #include "chrome/browser/sync/profile_sync_service_mock.h" 16 #include "chrome/browser/sync/profile_sync_service_mock.h"
18 #include "chrome/test/base/testing_profile.h" 17 #include "chrome/test/base/testing_profile.h"
18 #include "components/browser_sync/browser/profile_sync_service.h"
19 #include "components/signin/core/browser/profile_oauth2_token_service.h" 19 #include "components/signin/core/browser/profile_oauth2_token_service.h"
20 #include "components/signin/core/browser/signin_manager.h" 20 #include "components/signin/core/browser/signin_manager.h"
21 #include "content/public/test/test_browser_thread_bundle.h" 21 #include "content/public/test/test_browser_thread_bundle.h"
22 #include "net/http/http_status_code.h" 22 #include "net/http/http_status_code.h"
23 #include "net/url_request/url_request_context_getter.h" 23 #include "net/url_request/url_request_context_getter.h"
24 #include "testing/gmock/include/gmock/gmock.h" 24 #include "testing/gmock/include/gmock/gmock.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 26
27 using history::WebHistoryService; 27 using history::WebHistoryService;
28 using ::testing::Return; 28 using ::testing::Return;
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 " \"history_recording\": true\n" 424 " \"history_recording\": true\n"
425 "}")); 425 "}"));
426 scoped_ptr<base::DictionaryValue> response_value5; 426 scoped_ptr<base::DictionaryValue> response_value5;
427 // ReadResponse deletes the request 427 // ReadResponse deletes the request
428 response_value5 = TestingWebHistoryService::ReadResponse(request5.get()); 428 response_value5 = TestingWebHistoryService::ReadResponse(request5.get());
429 enabled_value = true; 429 enabled_value = true;
430 EXPECT_FALSE(response_value5->GetBoolean("history_recording_enabled", 430 EXPECT_FALSE(response_value5->GetBoolean("history_recording_enabled",
431 &enabled_value)); 431 &enabled_value));
432 EXPECT_TRUE(enabled_value); 432 EXPECT_TRUE(enabled_value);
433 } 433 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698