OLD | NEW |
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/macros.h" |
8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
9 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
12 #include "chrome/browser/history/web_history_service_factory.h" | 13 #include "chrome/browser/history/web_history_service_factory.h" |
13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
14 #include "chrome/browser/signin/signin_manager_factory.h" | 15 #include "chrome/browser/signin/signin_manager_factory.h" |
15 #include "chrome/browser/sync/profile_sync_service_factory.h" | 16 #include "chrome/browser/sync/profile_sync_service_factory.h" |
16 #include "chrome/browser/sync/profile_sync_test_util.h" | 17 #include "chrome/browser/sync/profile_sync_test_util.h" |
17 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 " \"history_recording\": true\n" | 424 " \"history_recording\": true\n" |
424 "}")); | 425 "}")); |
425 scoped_ptr<base::DictionaryValue> response_value5; | 426 scoped_ptr<base::DictionaryValue> response_value5; |
426 // ReadResponse deletes the request | 427 // ReadResponse deletes the request |
427 response_value5 = TestingWebHistoryService::ReadResponse(request5.get()); | 428 response_value5 = TestingWebHistoryService::ReadResponse(request5.get()); |
428 enabled_value = true; | 429 enabled_value = true; |
429 EXPECT_FALSE(response_value5->GetBoolean("history_recording_enabled", | 430 EXPECT_FALSE(response_value5->GetBoolean("history_recording_enabled", |
430 &enabled_value)); | 431 &enabled_value)); |
431 EXPECT_TRUE(enabled_value); | 432 EXPECT_TRUE(enabled_value); |
432 } | 433 } |
OLD | NEW |