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

Side by Side Diff: chrome/common/chrome_paths.cc

Issue 280753003: Add unit tests for the CLD component installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build on windows machines (no StartsWith/EndsWith parity) Created 6 years, 7 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
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | 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 "chrome/common/chrome_paths.h" 5 #include "chrome/common/chrome_paths.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac/bundle_locations.h" 10 #include "base/mac/bundle_locations.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 if (!PathService::Get(base::DIR_MODULE, &cur)) 363 if (!PathService::Get(base::DIR_MODULE, &cur))
364 return false; 364 return false;
365 cur = cur.Append(kO1DPluginFileName); 365 cur = cur.Append(kO1DPluginFileName);
366 break; 366 break;
367 case chrome::FILE_GTALK_PLUGIN: 367 case chrome::FILE_GTALK_PLUGIN:
368 if (!PathService::Get(base::DIR_MODULE, &cur)) 368 if (!PathService::Get(base::DIR_MODULE, &cur))
369 return false; 369 return false;
370 cur = cur.Append(kGTalkPluginFileName); 370 cur = cur.Append(kGTalkPluginFileName);
371 break; 371 break;
372 #endif 372 #endif
373 #if defined(CLD2_IS_COMPONENT)
374 case chrome::DIR_COMPONENT_CLD2: 373 case chrome::DIR_COMPONENT_CLD2:
375 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 374 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
376 return false; 375 return false;
377 cur = cur.Append(FILE_PATH_LITERAL("CLD")); 376 cur = cur.Append(FILE_PATH_LITERAL("CLD"));
378 break; 377 break;
379 #endif // defined(CLD2_IS_COMPONENT)
380 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) 378 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
381 #if defined(WIDEVINE_CDM_IS_COMPONENT) 379 #if defined(WIDEVINE_CDM_IS_COMPONENT)
382 case chrome::DIR_COMPONENT_WIDEVINE_CDM: 380 case chrome::DIR_COMPONENT_WIDEVINE_CDM:
383 if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) 381 if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
384 return false; 382 return false;
385 cur = cur.Append(kWidevineCdmBaseDirectory); 383 cur = cur.Append(kWidevineCdmBaseDirectory);
386 break; 384 break;
387 #endif // defined(WIDEVINE_CDM_IS_COMPONENT) 385 #endif // defined(WIDEVINE_CDM_IS_COMPONENT)
388 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings. 386 // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
389 // In the component case, this is the source adapter. Otherwise, it is the 387 // In the component case, this is the source adapter. Otherwise, it is the
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 600
603 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) { 601 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
604 g_invalid_specified_user_data_dir.Get() = user_data_dir; 602 g_invalid_specified_user_data_dir.Get() = user_data_dir;
605 } 603 }
606 604
607 const base::FilePath& GetInvalidSpecifiedUserDataDir() { 605 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
608 return g_invalid_specified_user_data_dir.Get(); 606 return g_invalid_specified_user_data_dir.Get();
609 } 607 }
610 608
611 } // namespace chrome 609 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698