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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 manifest.SetString(extensions::manifest_keys::kName, 281 manifest.SetString(extensions::manifest_keys::kName,
282 "launcher controller test extension"); 282 "launcher controller test extension");
283 manifest.SetString(extensions::manifest_keys::kVersion, "1"); 283 manifest.SetString(extensions::manifest_keys::kVersion, "1");
284 manifest.SetString(extensions::manifest_keys::kDescription, 284 manifest.SetString(extensions::manifest_keys::kDescription,
285 "for testing pinned apps"); 285 "for testing pinned apps");
286 286
287 extensions::TestExtensionSystem* extension_system( 287 extensions::TestExtensionSystem* extension_system(
288 static_cast<extensions::TestExtensionSystem*>( 288 static_cast<extensions::TestExtensionSystem*>(
289 extensions::ExtensionSystem::Get(profile()))); 289 extensions::ExtensionSystem::Get(profile())));
290 extension_service_ = extension_system->CreateExtensionService( 290 extension_service_ = extension_system->CreateExtensionService(
291 CommandLine::ForCurrentProcess(), base::FilePath(), false); 291 base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
292 292
293 std::string error; 293 std::string error;
294 extension1_ = Extension::Create(base::FilePath(), Manifest::UNPACKED, 294 extension1_ = Extension::Create(base::FilePath(), Manifest::UNPACKED,
295 manifest, 295 manifest,
296 Extension::NO_FLAGS, 296 Extension::NO_FLAGS,
297 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 297 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
298 &error); 298 &error);
299 extension2_ = Extension::Create(base::FilePath(), Manifest::UNPACKED, 299 extension2_ = Extension::Create(base::FilePath(), Manifest::UNPACKED,
300 manifest, 300 manifest,
301 Extension::NO_FLAGS, 301 Extension::NO_FLAGS,
(...skipping 2378 matching lines...) Expand 10 before | Expand all | Expand 10 after
2680 2680
2681 EXPECT_EQ(1, app_icon_loader->fetch_count()); 2681 EXPECT_EQ(1, app_icon_loader->fetch_count());
2682 ASSERT_EQ(initial_size + 1, model_->items().size()); 2682 ASSERT_EQ(initial_size + 1, model_->items().size());
2683 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); 2683 EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
2684 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); 2684 EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
2685 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); 2685 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
2686 2686
2687 launcher_controller_->UnpinAppWithID("1"); 2687 launcher_controller_->UnpinAppWithID("1");
2688 ASSERT_EQ(initial_size, model_->items().size()); 2688 ASSERT_EQ(initial_size, model_->items().size());
2689 } 2689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698