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

Side by Side Diff: chrome/browser/chromeos/mobile/mobile_activator_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
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 "chrome/browser/chromeos/mobile/mobile_activator.h" 5 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 DISALLOW_COPY_AND_ASSIGN(TestMobileActivator); 106 DISALLOW_COPY_AND_ASSIGN(TestMobileActivator);
107 }; 107 };
108 108
109 class MobileActivatorTest : public testing::Test { 109 class MobileActivatorTest : public testing::Test {
110 public: 110 public:
111 MobileActivatorTest() 111 MobileActivatorTest()
112 : cellular_network_(string(kTestServicePath)), 112 : cellular_network_(string(kTestServicePath)),
113 mobile_activator_(&cellular_network_) { 113 mobile_activator_(&cellular_network_) {
114 cellular_network_.PropertyChanged(shill::kTypeProperty, 114 cellular_network_.PropertyChanged(shill::kTypeProperty,
115 base::StringValue(shill::kTypeCellular)); 115 base::Value(shill::kTypeCellular));
116 } 116 }
117 ~MobileActivatorTest() override {} 117 ~MobileActivatorTest() override {}
118 118
119 protected: 119 protected:
120 void SetUp() override { 120 void SetUp() override {
121 DBusThreadManager::Initialize(); 121 DBusThreadManager::Initialize();
122 NetworkHandler::Initialize(); 122 NetworkHandler::Initialize();
123 } 123 }
124 void TearDown() override { 124 void TearDown() override {
125 mobile_activator_.TerminateActivation(); 125 mobile_activator_.TerminateActivation();
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING, 356 EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING,
357 mobile_activator_.InvokePickNextState(&cellular_network_, 357 mobile_activator_.InvokePickNextState(&cellular_network_,
358 &error_description)); 358 &error_description));
359 set_activator_state(MobileActivator::PLAN_ACTIVATION_SHOWING_PAYMENT); 359 set_activator_state(MobileActivator::PLAN_ACTIVATION_SHOWING_PAYMENT);
360 EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING, 360 EXPECT_EQ(MobileActivator::PLAN_ACTIVATION_RECONNECTING,
361 mobile_activator_.InvokePickNextState(&cellular_network_, 361 mobile_activator_.InvokePickNextState(&cellular_network_,
362 &error_description)); 362 &error_description));
363 } 363 }
364 364
365 } // namespace chromeos 365 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698