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

Side by Side Diff: chrome/browser/extensions/extension_settings_sync_unittest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
13 #include "base/task.h" 13 #include "base/task.h"
14 #include "chrome/browser/extensions/extension_settings_backend.h" 14 #include "chrome/browser/extensions/extension_settings_backend.h"
15 #include "chrome/browser/extensions/extension_settings_frontend.h" 15 #include "chrome/browser/extensions/extension_settings_frontend.h"
16 #include "chrome/browser/extensions/extension_settings_storage_cache.h" 16 #include "chrome/browser/extensions/extension_settings_storage_cache.h"
17 #include "chrome/browser/extensions/extension_settings_sync_util.h" 17 #include "chrome/browser/extensions/extension_settings_sync_util.h"
18 #include "chrome/browser/extensions/syncable_extension_settings_storage.h" 18 #include "chrome/browser/extensions/syncable_extension_settings_storage.h"
19 #include "chrome/browser/sync/api/sync_change_processor.h" 19 #include "chrome/browser/sync/api/sync_change_processor.h"
20 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
21 #include "content/test/test_browser_thread.h" 21 #include "content/test/test_browser_thread.h"
22 22
23 using content::BrowserThread;
24
23 // TODO(kalman): Integration tests for sync. 25 // TODO(kalman): Integration tests for sync.
24 26
25 namespace { 27 namespace {
26 28
27 // Gets the pretty-printed JSON for a value. 29 // Gets the pretty-printed JSON for a value.
28 static std::string GetJson(const Value& value) { 30 static std::string GetJson(const Value& value) {
29 std::string json; 31 std::string json;
30 base::JSONWriter::Write(&value, true, &json); 32 base::JSONWriter::Write(&value, true, &json);
31 return json; 33 return json;
32 } 34 }
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 sync_.GetOnlyChange("s3", "bar").change_type()); 504 sync_.GetOnlyChange("s3", "bar").change_type());
503 ASSERT_EQ( 505 ASSERT_EQ(
504 SyncChange::ACTION_DELETE, 506 SyncChange::ACTION_DELETE,
505 sync_.GetOnlyChange("s4", "foo").change_type()); 507 sync_.GetOnlyChange("s4", "foo").change_type());
506 ASSERT_EQ( 508 ASSERT_EQ(
507 SyncChange::ACTION_DELETE, 509 SyncChange::ACTION_DELETE,
508 sync_.GetOnlyChange("s4", "bar").change_type()); 510 sync_.GetOnlyChange("s4", "bar").change_type());
509 511
510 backend_->StopSyncing(syncable::EXTENSION_SETTINGS); 512 backend_->StopSyncing(syncable::EXTENSION_SETTINGS);
511 } 513 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698