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

Side by Side Diff: chrome/browser/sync/profile_sync_service_unittest.cc

Issue 439903002: [Sync] Move reenable logic into DTM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix dcheck Created 6 years, 4 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
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | components/sync_driver/data_type_manager.h » ('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 (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 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.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/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 : observer_(observer) {} 50 : observer_(observer) {}
51 virtual ~FakeDataTypeManager() {}; 51 virtual ~FakeDataTypeManager() {};
52 52
53 virtual void Configure(syncer::ModelTypeSet desired_types, 53 virtual void Configure(syncer::ModelTypeSet desired_types,
54 syncer::ConfigureReason reason) OVERRIDE { 54 syncer::ConfigureReason reason) OVERRIDE {
55 sync_driver::DataTypeManager::ConfigureResult result; 55 sync_driver::DataTypeManager::ConfigureResult result;
56 result.status = sync_driver::DataTypeManager::OK; 56 result.status = sync_driver::DataTypeManager::OK;
57 observer_->OnConfigureDone(result); 57 observer_->OnConfigureDone(result);
58 } 58 }
59 59
60 virtual void ReenableType(syncer::ModelType type) OVERRIDE {}
60 virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types, 61 virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types,
61 syncer::ConfigureReason reason) OVERRIDE {} 62 syncer::ConfigureReason reason) OVERRIDE {}
62 virtual void Stop() OVERRIDE {}; 63 virtual void Stop() OVERRIDE {};
63 virtual State state() const OVERRIDE { 64 virtual State state() const OVERRIDE {
64 return sync_driver::DataTypeManager::CONFIGURED; 65 return sync_driver::DataTypeManager::CONFIGURED;
65 }; 66 };
66 67
67 private: 68 private:
68 sync_driver::DataTypeManagerObserver* observer_; 69 sync_driver::DataTypeManagerObserver* observer_;
69 }; 70 };
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 // See that we can override the URL with a flag. 608 // See that we can override the URL with a flag.
608 CommandLine command_line( 609 CommandLine command_line(
609 base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe")))); 610 base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
610 command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar"); 611 command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
611 EXPECT_EQ("https://foo/bar", 612 EXPECT_EQ("https://foo/bar",
612 ProfileSyncService::GetSyncServiceURL(command_line).spec()); 613 ProfileSyncService::GetSyncServiceURL(command_line).spec());
613 } 614 }
614 615
615 } // namespace 616 } // namespace
616 } // namespace browser_sync 617 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | components/sync_driver/data_type_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698